APIGOV-27565 - fix

Axway · May 10, 2024 · 907eb37 · 907eb37
1 parent 293b85c
commit 907eb37
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
@@ -71,13 +71,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-            registry: ghcr.io
-            username: ${{ github.actor }}
-            password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set outputs
         id: vars
         run: |
@@ -86,6 +79,13 @@ jobs:
           echo "sdkversion=$(grep github.com/Axway/agent-sdk go.mod |  awk '{print $2}')" >> $GITHUB_OUTPUT
           echo "commit=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
       
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+            registry: ghcr.io
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -99,14 +99,14 @@ jobs:
           context: .
           file: build/traceability/Dockerfile
           push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             time=${{ steps.vars.outputs.date }}
             CGO_ENABLED=0
             version=${{ steps.vars.outputs.tag }}
             sdk_version=${{ steps.vars.outputs.sdkversion }}
             commit_id=${{ steps.vars.outputs.commit }}
-            tags: ${{ steps.meta.outputs.tags }}
-            labels: ${{ steps.meta.outputs.labels }}
 
   notifyTeamsChannel:
     runs-on: ubuntu-latest