Merge pull request #242 from WyriHaximusNet/pass-in-auth-secrets-to-w…

…orkflow_call Pass in auth secrets to workflow_call
WyriHaximusNet · Feb 11, 2024 · 6695618 · 6695618
2 parents 8d7b013 + 9cfb987
commit 6695618
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -25,3 +25,6 @@ jobs:
     with:
       alpine: ${{ needs.supported-alpine-versions.outputs.alpine }}
       debian: "[]"
+      docker_user: secrets.HUB_USERNAME
+      ghcr_token: secrets.GHCR_TOKEN
+      hub_passcode: secrets.HUB_PASSCODE
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,6 +16,18 @@ on:
         description: JSON string with Debian versions to build
         required: true
         type: string
+      docker_user:
+        description: Auth
+        required: true
+        type: string
+      ghcr_token:
+        description: Auth
+        required: true
+        type: string
+      hub_passcode:
+        description: Auth
+        required: true
+        type: string
 
 jobs:
   supported-php-versions:
@@ -279,9 +291,9 @@ jobs:
           command: |
             (jq -r 'to_entries | map("echo \"$" + .value + "\" | docker login " + .key + " --username \"${{ env.DOCKER_USER }}\" --password-stdin") | .[]' <<<"$DOCKER_IMAGE_REGISTRIES_SECRET_MAPPING") | sh
         env:
-          DOCKER_USER: ${{ secrets.HUB_USERNAME }}
-          GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
-          HUB_PASSCODE: ${{ secrets.HUB_PASSCODE }}
+          DOCKER_USER: ${{ inputs.docker_user }}
+          GHCR_TOKEN: ${{ inputs.ghcr_token }}
+          HUB_PASSCODE: ${{ inputs.hub_passcode }}
       - name: Docker info
         run: docker info
       - name: Retag

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -25,3 +25,6 @@ jobs:
     with:
       alpine: "[]"
       debian: ${{ needs.supported-debian-versions.outputs.debian }}
+      docker_user: secrets.HUB_USERNAME
+      ghcr_token: secrets.GHCR_TOKEN
+      hub_passcode: secrets.HUB_PASSCODE