diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da0a74887f..f70d177cc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -233,7 +233,6 @@ jobs: base_path: ./bitwarden_license/src docker_repos: [bitwarden, bitwardenqa.azurecr.io] dotnet: true - skip_dct: true steps: - name: Checkout repo uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 @@ -334,7 +333,6 @@ jobs: && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc') - && (!matrix.skip_dct) env: DCT_DELEGATION_KEY_ID: "c9bde8ec820701516491e5e03d3a6354e7bd66d05fa3df2b0062f68b116dc59c" DCT_DELEGATE_KEY: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-key }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe23603531..f1041f20fd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -208,7 +208,6 @@ jobs: origin_docker_repo: bitwarden - project_name: Scim origin_docker_repo: bitwarden - skip_dct: true steps: - name: Print environment env: @@ -240,16 +239,6 @@ jobs: azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} azure-keyvault-name: "bitwarden-prod-kv" - - name: Check for DCT value - id: check-matrix-dct - if: matrix.origin_docker_repo == 'bitwarden' - run: | - if [[ "${{ matrix.skip_dct }}" == "true" ]]; then - echo "dct_enabled=0" >> $GITHUB_OUTPUT - else - echo "dct_enabled=1" >> $GITHUB_OUTPUT - fi - - name: Pull latest project image if: matrix.origin_docker_repo == 'bitwarden' env: @@ -275,7 +264,7 @@ jobs: - name: Push version and latest image if: ${{ github.event.inputs.release_type != 'Dry Run' && matrix.origin_docker_repo == 'bitwarden' }} env: - DOCKER_CONTENT_TRUST: ${{ steps.check-matrix-dct.outputs.dct_enabled }} + DOCKER_CONTENT_TRUST: 1 DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }} PROJECT_NAME: ${{ steps.setup.outputs.project_name }} run: docker push bitwarden/$PROJECT_NAME:$_RELEASE_VERSION