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
11 changes: 6 additions & 5 deletions .github/workflows/.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ on:
distros:
required: false
type: string
dockerhub_username:
required: false
type: string
secrets:
rh_user:
required: false
rh_pass:
required: false
dockerpublicbot_username:
required: false
dockerpublicbot_write_pat:
dockerhub_token:
required: false
ghtoken:
required: false
Expand Down Expand Up @@ -257,8 +258,8 @@ jobs:
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
if: ${{ inputs.release || github.event_name == 'schedule' }}
with:
username: ${{ secrets.dockerpublicbot_username }}
password: ${{ secrets.dockerpublicbot_write_pat }}
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 @@ -32,8 +32,8 @@ jobs:
release: pushonly
envs: |
NIGHTLY_BUILD=1
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -55,8 +55,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -55,8 +55,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -55,8 +55,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -67,8 +67,8 @@ jobs:
PKG_RPM_RELEASE=${{ inputs.revision }}
RUNC_REF=${{ inputs.runc_ref }}
GO_VERSION=${{ inputs.go_version }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -55,8 +55,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -67,11 +67,11 @@ jobs:
PKG_REF=${{ inputs.engine-ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}

cli:
uses: ./.github/workflows/.build.yml
Expand All @@ -86,8 +86,8 @@ jobs:
PKG_REF=${{ inputs.cli-ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
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 @@ -55,8 +55,8 @@ jobs:
PKG_REF=${{ inputs.ref }}
PKG_DEB_REVISION=${{ inputs.revision }}
PKG_RPM_RELEASE=${{ inputs.revision }}
dockerhub_username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
secrets:
rh_user: ${{ secrets.RH_USER }}
rh_pass: ${{ secrets.RH_PASS }}
dockerpublicbot_username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
dockerpublicbot_write_pat: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
dockerhub_token: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
Loading