Skip to content

Commit 36db980

Browse files
authored
chore(ci): enable dockerhub organization access token (OAT) (#14572)
KAG-7040
1 parent 77aa98b commit 36db980

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ on: # yamllint disable-line rule:truthy
3030

3131
env:
3232
# official release repo
33+
DOCKER_ORGANIZATION: kong
3334
DOCKER_REPOSITORY: kong/kong
3435
PRERELEASE_DOCKER_REPOSITORY: kong/kong-dev
3536
FULL_RELEASE: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.actor == 'dependabot[bot]'}}
@@ -335,8 +336,8 @@ jobs:
335336
if: ${{ env.HAS_ACCESS_TO_GITHUB_TOKEN == 'true' }}
336337
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v2.1.0
337338
with:
338-
username: ${{ secrets.GHA_DOCKERHUB_PUSH_USER }}
339-
password: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUSH_TOKEN }}
339+
username: ${{ env.DOCKER_ORGANIZATION }}
340+
password: ${{ secrets.DOCKER_OAT_PUSH }}
340341

341342
- name: Docker meta
342343
id: meta
@@ -464,8 +465,8 @@ jobs:
464465
if: ${{ env.HAS_ACCESS_TO_GITHUB_TOKEN }}
465466
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v2.1.0
466467
with:
467-
username: ${{ secrets.GHA_DOCKERHUB_PUSH_USER }}
468-
password: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUSH_TOKEN }}
468+
username: ${{ env.DOCKER_ORGANIZATION }}
469+
password: ${{ secrets.DOCKER_OAT_PUSH }}
469470

470471
# TODO: Refactor matrix file to support and parse platforms specific to distro
471472
# Workaround: Look for specific amd64 and arm64 hardcooded architectures
@@ -590,8 +591,8 @@ jobs:
590591
if: ${{ env.HAS_ACCESS_TO_GITHUB_TOKEN == 'true' }}
591592
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v2.1.0
592593
with:
593-
username: ${{ secrets.GHA_DOCKERHUB_PUSH_USER }}
594-
password: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUSH_TOKEN }}
594+
username: ${{ env.DOCKER_ORGANIZATION }}
595+
password: ${{ secrets.DOCKER_OAT_PUSH }}
595596

596597
- uses: actions/checkout@v4
597598

0 commit comments

Comments
 (0)