Skip to content

[29.x backport] gha/build: Use OIDC for Docker Hub login #7132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vvoland wants to merge 2 commits into
base: 29.x
Choose a base branch
from
+8 −4
Open

[29.x backport] gha/build: Use OIDC for Docker Hub login #7132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ac60e
gha: bump docker/login-action from 4.2.0 to 4.5.0
vvoland Jul 28, 2026
2fbd125
gha/build: Use OIDC for Docker Hub login
vvoland Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,18 @@ jobs:
bin-image:
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/cli' }}
permissions:
contents: read
id-token: write
steps:
-
name: Login to DockerHub
name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
uses: docker/login-action@06fb636fac595d6fb4b28a5dfcb21a6f5091859c # v4.5.0
env:
DOCKERHUB_OIDC_CONNECTIONID: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
with:
username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }}
password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
username: dockereng

@docker-agent docker-agent Jul 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[medium] Hardcoded username: dockereng may mismatch the OIDC-linked Docker Hub account

The login step now uses hardcoded username: dockereng instead of the former ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }}. In Docker Hub's OIDC federation, the username field must match the account that has the OIDC connection configured. If DOCKERHUB_CLIBIN_USERNAME previously referred to a service account other than dockereng, the OIDC token exchange will fail because the username used to look up the OIDC connection will be wrong.

If dockereng is the correct Docker Hub org/account that owns the OIDC connection (likely, given that Docker CLI bin images are published under dockereng), this is fine — but it is worth double-checking that the OIDC connection in Docker Hub is registered against the dockereng account, not against the previous service account that DOCKERHUB_CLIBIN_USERNAME pointed to.

Confidence Score
🟠 weak 52/100

-
name: Set up QEMU
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
Expand Down
Loading