Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions .github/workflows/.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ on:
dockerhub_username:
required: false
type: string
dockerhub_oidc_connectionid:
required: false
type: string
secrets:
rh_user:
required: false
rh_pass:
required: false
dockerhub_token:
required: false

env:
REPO_SLUG: dockereng/packaging
Expand Down Expand Up @@ -294,11 +295,12 @@ jobs:
bake-target: meta-helper
-
name: Login to Docker Hub
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
if: ${{ inputs.release || github.event_name == 'schedule' }}
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
env:
DOCKERHUB_OIDC_CONNECTIONID: ${{ inputs.dockerhub_oidc_connectionid }}
with:
username: ${{ inputs.dockerhub_username }}
password: ${{ secrets.dockerhub_token }}
-
name: Build release
id: build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
release: pushonly
vars: |
NIGHTLY_BUILD=1
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/release-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/release-buildx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/release-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/release-containerd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:
PKG_RPM_RELEASE=${{ inputs.revision }}
RUNC_REF=${{ inputs.runc_ref }}
GO_VERSION=${{ inputs.go_version }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/release-credential-helpers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
8 changes: 4 additions & 4 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ jobs:
PKG_REF=${{ inputs.engine-ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

cli:
uses: ./.github/workflows/.build.yml
Expand All @@ -88,8 +88,8 @@ jobs:
PKG_REF=${{ inputs.cli-ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/release-model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
dockerhub_username: docker
dockerhub_oidc_connectionid: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
Loading