docker/build-push-action
1
0
Fork 0
mirror of https://github.com/docker/build-push-action.git synced 2026-08-10 20:12:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1595 from crazy-max/dockerhub-oidc

Browse Source 
ci(e2e): use Docker Hub OIDC for test image
This commit is contained in:
CrazyMax
2026-08-10 19:39:20 +02:00
committed by GitHub
parent b976998676 2a30ab2a50
commit 2ca78c6bec
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/.e2e-run.yml
+2
View File
@@ -130,6 +130,8 @@ jobs:
name: Login to Registry
if: github.event_name != 'pull_request' && (inputs.type == 'remote' || inputs.provider == 'aws' || env.REGISTRY_USER != '')
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
env:
DOCKERHUB_OIDC_CONNECTIONID: ${{ inputs.provider == 'dockerhub' && vars.DOCKERHUB_OIDC_CONNECTIONID || '' }}
with:
registry: ${{ env.REGISTRY_FQDN || inputs.registry }}
username: ${{ env.REGISTRY_USER || secrets.registry_username || (inputs.registry == 'ghcr.io' && github.actor) || '' }}
.github/workflows/e2e.yml
+3 -4
View File
@@ -22,7 +22,7 @@ jobs:
uses: ./.github/workflows/.e2e-run.yml
permissions:
contents: read
id-token: write # to get AWS credentials
id-token: write # to get Docker Hub and AWS credentials
packages: write # to push image to GHCR
strategy:
fail-fast: false
@@ -107,10 +107,10 @@ jobs:
secrets:
# Pass only the registry-specific secrets needed by each matrix entry.
# GHCR uses the called workflow's GITHUB_TOKEN fallback.
# AWS ECR uses OIDC to get credentials.
# Docker Hub and AWS ECR use OIDC to get credentials.
registry_username: >-
${{
matrix.provider == 'dockerhub' && vars.DOCKERPUBLICBOT_USERNAME ||
matrix.provider == 'dockerhub' && 'dockereng' ||
matrix.provider == 'gitlab' && secrets.GITLAB_USERNAME ||
matrix.provider == 'gar' && secrets.GAR_USERNAME ||
matrix.provider == 'acr' && secrets.AZURE_CLIENT_ID ||
@@ -120,7 +120,6 @@ jobs:
}}
registry_password: >-
${{
matrix.provider == 'dockerhub' && secrets.DOCKERPUBLICBOT_WRITE_PAT ||
matrix.provider == 'gitlab' && secrets.GITLAB_TOKEN ||
matrix.provider == 'gar' && secrets.GAR_JSON_KEY ||
matrix.provider == 'acr' && secrets.AZURE_CLIENT_SECRET ||