diff --git a/.github/actions/docker-build-artifacts/action.yml b/.github/actions/docker-build-artifacts/action.yml index 0d46ebab..36046bb4 100644 --- a/.github/actions/docker-build-artifacts/action.yml +++ b/.github/actions/docker-build-artifacts/action.yml @@ -41,7 +41,7 @@ runs: shell: bash working-directory: ${{ inputs.WORKING_DIRECTORY }} run: | - env REPO_PASSWORD='${{ env.REPO_PASSWORD }}' docker build \ + env REPO_PASSWORD='${{ env.REPO_PASSWORD }}' DEPLOYMENT_TOKEN='${{ env.DEPLOYMENT_TOKEN }}' docker build \ --build-arg BUILD_NUMBER="${GITHUB_RUN_ID}" \ --build-arg GIT_SHA="$(echo ${GITHUB_SHA} | cut -c1-10)" \ --build-arg MAINTAINER="${{ inputs.MAINTAINER }}" \ @@ -51,6 +51,7 @@ runs: --platform linux/${{ inputs.PLATFORM }} \ --progress=plain \ --secret id=REPO_PASSWORD,env=REPO_PASSWORD \ + --secret id=DEPLOYMENT_TOKEN,env=DEPLOYMENT_TOKEN \ --tag artifacts-${GITHUB_RUN_ID}:${GITHUB_SHA} \ --ulimit nofile=1024000:1024000 \ . 2>&1 | tee -a ${{ inputs.BUILD_LOG_FILENAME }} diff --git a/.github/workflows/cicd-docker-build-and-distribute.yml b/.github/workflows/cicd-docker-build-and-distribute.yml index e60fa829..49fc0c32 100644 --- a/.github/workflows/cicd-docker-build-and-distribute.yml +++ b/.github/workflows/cicd-docker-build-and-distribute.yml @@ -87,9 +87,11 @@ on: required: true USERNAME: required: true + REPO_USERNAME: + required: false REPO_PASSWORD: required: false - REPO_USERNAME: + DEPLOYMENT_TOKEN: required: false GH_BOT_DEPLOY_TOKEN: required: true @@ -135,6 +137,7 @@ jobs: env: REPO_USERNAME: ${{ secrets.REPO_USERNAME }} REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }} + DEPLOYMENT_TOKEN: ${{ secrets.DEPLOYMENT_TOKEN }} - name: Upload build logs uses: actions/upload-artifact@v4