From 16ac60e8e2f11ab00a05b48ef8176b25584f9790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Tue, 28 Jul 2026 15:37:47 +0200 Subject: [PATCH 1/2] gha: bump docker/login-action from 4.2.0 to 4.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OIDC login requires docker/login-action v4.5.0 or newer Signed-off-by: Paweł Gronowski --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 212c548d4ce1..cbb1483aef9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0 + uses: docker/login-action@06fb636fac595d6fb4b28a5dfcb21a6f5091859c # v4.5.0 with: username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }} password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }} From 2fbd125c7758244ce8709e14d13b0e079cd8b790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Tue, 28 Jul 2026 14:20:25 +0200 Subject: [PATCH 2/2] gha/build: Use OIDC for Docker Hub login MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski (cherry picked from commit 5ff2ff631183baacf8e2bad36e1c49128383abd6) Signed-off-by: Paweł Gronowski --- .github/workflows/build.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbb1483aef9f..2076c6a24646 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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@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 - name: Set up QEMU uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0