From 3d01c8af6b1c683bc460cb83e8500abd72363fa7 Mon Sep 17 00:00:00 2001 From: Ryan Cragun Date: Mon, 7 Oct 2024 12:43:20 -0600 Subject: [PATCH] containerize: use latest docker action (#28612) Use the latest Docker action to ensure correct arm64 container builds Signed-off-by: Ryan Cragun --- .github/actions/containerize/action.yml | 4 ++-- .github/workflows/build-artifacts-ce.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/containerize/action.yml b/.github/actions/containerize/action.yml index b9610931164f..c0809d3afd6f 100644 --- a/.github/actions/containerize/action.yml +++ b/.github/actions/containerize/action.yml @@ -104,7 +104,7 @@ runs: [[ ! -d "$dest_dir" ]] && mkdir -p "$dest_dir" [[ ! -f "$dest_path" ]] && cp ${{ inputs.vault-binary-path }} "${dest_path}" - if: inputs.docker == 'true' - uses: hashicorp/actions-docker-build@v2 + uses: hashicorp/actions-docker-build@f22d5ac7d36868afaa4be1cc1203ec1b5865cadd with: arch: ${{ inputs.goarch }} do_zip_extract_step: 'false' # Don't download and extract an already present binary @@ -113,7 +113,7 @@ runs: revision: ${{ steps.vars.outputs.revision }} version: ${{ steps.vars.outputs.container-version }} - if: inputs.redhat == 'true' - uses: hashicorp/actions-docker-build@v2 + uses: hashicorp/actions-docker-build@f22d5ac7d36868afaa4be1cc1203ec1b5865cadd with: arch: ${{ inputs.goarch }} do_zip_extract_step: 'false' # Don't download and extract an already present binary diff --git a/.github/workflows/build-artifacts-ce.yml b/.github/workflows/build-artifacts-ce.yml index 67f17df17442..0d0a0731bc50 100644 --- a/.github/workflows/build-artifacts-ce.yml +++ b/.github/workflows/build-artifacts-ce.yml @@ -100,7 +100,7 @@ jobs: redhat: true - goos: linux goarch: arm64 - redhat: false + redhat: true fail-fast: true runs-on: ${{ fromJSON(inputs.compute-build) }} name: (${{ matrix.goos }}, ${{ matrix.goarch }})