Skip to content

Commit fdb4e09

Browse files
vvolandvvoland
authored
Merge pull request #485 from crazy-max/oidc-auth
ci: use Docker Hub OIDC for packaging images
2 parents 857b3be + 2e744b6 commit fdb4e09

9 files changed

Lines changed: 24 additions & 22 deletions

‎.github/workflows/.build.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ on:
1919
dockerhub_username:
2020
required: false
2121
type: string
22+
dockerhub_oidc_connectionid:
23+
required: false
24+
type: string
2225
secrets:
2326
rh_user:
2427
required: false
2528
rh_pass:
2629
required: false
27-
dockerhub_token:
28-
required: false
2930

3031
env:
3132
REPO_SLUG: dockereng/packaging
@@ -294,11 +295,12 @@ jobs:
294295
bake-target: meta-helper
295296
-
296297
name: Login to Docker Hub
297-
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
298298
if: ${{ inputs.release || github.event_name == 'schedule' }}
299+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
300+
env:
301+
DOCKERHUB_OIDC_CONNECTIONID: ${{ inputs.dockerhub_oidc_connectionid }}
299302
with:
300303
username: ${{ inputs.dockerhub_username }}
301-
password: ${{ secrets.dockerhub_token }}
302304
-
303305
name: Build release
304306
id: build

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
release: pushonly
3434
vars: |
3535
NIGHTLY_BUILD=1
36-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
36+
dockerhub_username: docker
37+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
3738
secrets:
3839
rh_user: ${{ secrets.RH_USER }}
3940
rh_pass: ${{ secrets.RH_PASS }}
40-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-agent.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
PKG_REF=${{ inputs.ref }}
5757
PKG_DEB_REVISION=${{ inputs.revision }}
5858
PKG_RPM_RELEASE=${{ inputs.revision }}
59-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
59+
dockerhub_username: docker
60+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
6061
secrets:
6162
rh_user: ${{ secrets.RH_USER }}
6263
rh_pass: ${{ secrets.RH_PASS }}
63-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-buildx.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
PKG_REF=${{ inputs.ref }}
5757
PKG_DEB_REVISION=${{ inputs.revision }}
5858
PKG_RPM_RELEASE=${{ inputs.revision }}
59-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
59+
dockerhub_username: docker
60+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
6061
secrets:
6162
rh_user: ${{ secrets.RH_USER }}
6263
rh_pass: ${{ secrets.RH_PASS }}
63-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
PKG_REF=${{ inputs.ref }}
5757
PKG_DEB_REVISION=${{ inputs.revision }}
5858
PKG_RPM_RELEASE=${{ inputs.revision }}
59-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
59+
dockerhub_username: docker
60+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
6061
secrets:
6162
rh_user: ${{ secrets.RH_USER }}
6263
rh_pass: ${{ secrets.RH_PASS }}
63-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-containerd.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ jobs:
6868
PKG_RPM_RELEASE=${{ inputs.revision }}
6969
RUNC_REF=${{ inputs.runc_ref }}
7070
GO_VERSION=${{ inputs.go_version }}
71-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
71+
dockerhub_username: docker
72+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
7273
secrets:
7374
rh_user: ${{ secrets.RH_USER }}
7475
rh_pass: ${{ secrets.RH_PASS }}
75-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-credential-helpers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
PKG_REF=${{ inputs.ref }}
5757
PKG_DEB_REVISION=${{ inputs.revision }}
5858
PKG_RPM_RELEASE=${{ inputs.revision }}
59-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
59+
dockerhub_username: docker
60+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
6061
secrets:
6162
rh_user: ${{ secrets.RH_USER }}
6263
rh_pass: ${{ secrets.RH_PASS }}
63-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ jobs:
6868
PKG_REF=${{ inputs.engine-ref }}
6969
PKG_DEB_REVISION=${{ inputs.revision }}
7070
PKG_RPM_RELEASE=${{ inputs.revision }}
71-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
71+
dockerhub_username: docker
72+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
7273
secrets:
7374
rh_user: ${{ secrets.RH_USER }}
7475
rh_pass: ${{ secrets.RH_PASS }}
75-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
7676

7777
cli:
7878
uses: ./.github/workflows/.build.yml
@@ -88,8 +88,8 @@ jobs:
8888
PKG_REF=${{ inputs.cli-ref }}
8989
PKG_DEB_REVISION=${{ inputs.revision }}
9090
PKG_RPM_RELEASE=${{ inputs.revision }}
91-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
91+
dockerhub_username: docker
92+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
9293
secrets:
9394
rh_user: ${{ secrets.RH_USER }}
9495
rh_pass: ${{ secrets.RH_PASS }}
95-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

‎.github/workflows/release-model.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
PKG_REF=${{ inputs.ref }}
5757
PKG_DEB_REVISION=${{ inputs.revision }}
5858
PKG_RPM_RELEASE=${{ inputs.revision }}
59-
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
59+
dockerhub_username: docker
60+
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
6061
secrets:
6162
rh_user: ${{ secrets.RH_USER }}
6263
rh_pass: ${{ secrets.RH_PASS }}
63-
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

0 commit comments

Comments
 (0)