test-build

grafana · Oct 27, 2023 · b2dc496 · b2dc496
1 parent 8ce56a2
commit b2dc496
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,12 +5,17 @@ on:
   push:
     branches:
       - main
+      - test-build
     tags:
       - v*
   pull_request:
     branches:
       - '*'
 
+permissions:
+  contents: read
+  id-token: write
+
 env:
   REGISTRY_IMAGE: grafana/tanka
   TAGS_CONFIG: |
@@ -58,8 +63,8 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ env.DOCKERHUB_TOKEN }}
 
       - name: Build and push by digest
         id: build
@@ -88,6 +93,8 @@ jobs:
   merge:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
+    needs: 
+      - build
     steps:
       - name: Download digests
         uses: actions/download-artifact@v3