Fix docker workflow (#4518)

grafana · Jan 7, 2025 · f0c416f · f0c416f
1 parent b08688e
commit f0c416f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/docker-ci-tools.yml b/.github/workflows/docker-ci-tools.yml
@@ -1,6 +1,7 @@
 name: docker-ci-tools
 on:
   push:
+    # If you define both branches/branches-ignore and paths/paths-ignore, the workflow will only run when both filters are satisfied.
     branches:
       - 'main'
     paths:

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: docker-ci-tools
+name: docker
 on:
   push:
     branches:
@@ -61,13 +61,15 @@ jobs:
 
       - name: docker-push
         run: |
-            docker push grafana/${{ matrix.component }}:$TAG_ARCH
+          TAG_ARCH="$TAG-${{ matrix.runner_arch.arch }}"          
+          docker push grafana/${{ matrix.component }}:$TAG_ARCH
 
 
   cd-to-dev-env:
     # This job deploys the latest main commit to the dev environment
     if: github.repository == 'grafana/tempo' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-24.04
+    needs: docker
     steps:
       - name: Checkout
         uses: actions/checkout@v4