Fix workflow with non owner actor (#23)

* Update build-docker-image.yml * Update docker.yml
ngreatorex · Nov 16, 2023 · ddcd4e0 · ddcd4e0
1 parent ad1c027
commit ddcd4e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -86,8 +86,8 @@ jobs:
       if: "contains( inputs.image, 'ghcr.io' )"
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GHCR_TOKEN }}
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -42,6 +42,7 @@ jobs:
     name: Build base image
     needs: configure-jobs
     uses: ./.github/workflows/build-docker-image.yml
+    secrets: inherit
     with:
       platforms: ${{ vars.DOCKER_PLATFORMS }}
       image: ${{ needs.configure-jobs.outputs.image }}
@@ -52,7 +53,6 @@ jobs:
         type=semver,pattern={{major}}.{{minor}}
         type=semver,pattern={{major}}
         type=sha
-    secrets: inherit
 
   build-configured-images:
     name: Build configured images
@@ -64,6 +64,7 @@ jobs:
       matrix: 
         config-name: ${{ fromJson(needs.configure-jobs.outputs.configs) }}
     uses: ./.github/workflows/build-docker-image.yml
+    secrets: inherit
     with:
       build-args: |
         FROM_IMAGE=${{ needs.build-base-image.outputs.tag }}