Merge branch 'main' into 20-move-weather-symbol-code-to-separate-repo

Author: vegardb

.github/workflows/build.yml

@@ -3,7 +3,6 @@ name: Build
 on:
   push:
     branches: ["**"]
-    tags: ["**"]
   pull_request:
 
 jobs:
@@ -19,73 +18,21 @@ jobs:
           - moxfrontend
           - rawdataforecaster
           - xmlfrontend
-    env:
-      ACR_IMAGE: fortiregistry.azurecr.io/${{ matrix.service }}:${{ github.run_id }}
-      GHCR_IMAGE: ghcr.io/${{ github.repository }}/${{ matrix.service }}:${{ github.run_id }}
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ACR
-        uses: docker/login-action@v4
-        with:
-          registry: fortiregistry.azurecr.io
-          username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
-          password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        run: |
-          docker build -t $ACR_IMAGE -t $GHCR_IMAGE -f ${{ matrix.service }}/build/package/Dockerfile .
-          docker push $ACR_IMAGE
-          docker push $GHCR_IMAGE
-
-  fortiup:
-    name: Build fortiup
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/fortiup')
-    steps:
-      - uses: actions/checkout@v4
-
-      # Produce a filesystem-safe slug from the tag name (e.g. fortiup/0.4.0 -> fortiup-0-4-0),
-      # mirroring GitLab's $CI_COMMIT_REF_SLUG behaviour.
-      - name: Create ref slug
-        id: slug
-        run: echo "slug=$(echo '${{ github.ref_name }}' | tr '/.' '-')" >> "$GITHUB_OUTPUT"
-      - name: Login to ACR
-        uses: docker/login-action@v4
-        with:
-          registry: fortiregistry.azurecr.io
-          username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
-          password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
-      - name: Build image and extract binary
-        env:
-          ACR_IMAGE: fortiregistry.azurecr.io/fortiup:${{ github.run_id }}
-        run: |
-          docker build -t $ACR_IMAGE -f fortiup/build/package/Dockerfile .
-          docker push $ACR_IMAGE
-          docker run --rm --entrypoint cat $ACR_IMAGE /usr/local/bin/fortiup > ${{ steps.slug.outputs.slug }}
-          chmod +x ${{ steps.slug.outputs.slug }}
-
-      - name: Upload binary artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.slug.outputs.slug }}
-          path: ${{ steps.slug.outputs.slug }}
+      - name: Build
+        run: docker build -f ${{ matrix.service }}/build/package/Dockerfile .
 
   vulncheck:
     name: Vulnerability check
     needs: [build]
     runs-on: ubuntu-latest
     container:
-      # Requires AZURE_REGISTRY_USERNAME and AZURE_REGISTRY_PASSWORD secrets to pull the image.
       # Build/push the devcontainer image via the devcontainer.yml workflow when it changes.
-      image: fortiregistry.azurecr.io/devcontainer:latest
+      image: ghcr.io/${{ github.repository }}/devcontainer:latest
       credentials:
-        username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
-        password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - run: govulncheck ./...

.github/workflows/devcontainer.yml

@@ -7,28 +7,20 @@ jobs:
   devcontainer:
     name: Build and push devcontainer image
     runs-on: ubuntu-latest
-    env:
-      ACR_IMAGE: fortiregistry.azurecr.io/devcontainer:latest
-      GHCR_IMAGE: ghcr.io/${{ github.repository }}/devcontainer:latest
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ACR
-        uses: docker/login-action@v4
-        with:
-          registry: fortiregistry.azurecr.io
-          username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
-          password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and push
-        run: |
-          docker build \
-            -t $ACR_IMAGE \
-            -t $GHCR_IMAGE \
-            -f .devcontainer/Dockerfile .
-          docker push $ACR_IMAGE
-          docker push $GHCR_IMAGE
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: .devcontainer/Dockerfile
+          push: true
+          tags: ghcr.io/${{ github.repository }}/devcontainer:latest

.github/workflows/release.yml

@@ -0,0 +1,57 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  release:
+    name: Release ${{ matrix.service }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        service:
+          - correctedforecaster
+          - healthz
+          - jsonfrontend
+          - moxfrontend
+          - rawdataforecaster
+          - xmlfrontend
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            fortiregistry.azurecr.io/${{ matrix.service }}
+            ghcr.io/${{ github.repository }}/${{ matrix.service }}
+          tags: |
+            type=semver,pattern=v{{major}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
+
+      - name: Login to ACR
+        uses: docker/login-action@v4
+        with:
+          registry: fortiregistry.azurecr.io
+          username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
+          password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ${{ matrix.service }}/build/package/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}