Skip to content

Commit

Permalink
Merge pull request #145 from pact-foundation/ci/fix_build
Browse files Browse the repository at this point in the history
chore: update ca-certs / use arm builder for audit
  • Loading branch information
YOU54F authored Jan 20, 2025
2 parents 15da6ab + 06c12f8 commit fd19250
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ jobs:
strategy:
fail-fast: false
matrix:
DOCKER_TARGET_PLATFORM: [
# linux/arm, # Disabled whilst waiting for next release of trivy with published arm artefacts
linux/arm64,
linux/amd64
]
runs-on: ubuntu-latest
os: [ ubuntu-latest, ubuntu-24.04-arm ]
runs-on: ${{ matrix.os }}
env:
DOCKER_TARGET_PLATFORM: ${{ matrix.DOCKER_TARGET_PLATFORM }}
TAG: latest
steps:
- uses: actions/checkout@v4
- name: Prepare Docker multi-arch builder for ${{ matrix.DOCKER_TARGET_PLATFORM }}
if: ${{ matrix.DOCKER_TARGET_PLATFORM }} == 'linux/arm' || 'linux/arm64'
run: ./script/release-workflow/docker-prepare.sh
- name: Audit Docker image for ${{ matrix.DOCKER_TARGET_PLATFORM }}
- name: Audit Docker image for amd64
if: ${{ matrix.os == 'ubuntu-latest' }}
run: ./script/release-workflow/audit.sh
env:
DOCKER_TARGET_PLATFORM: linux/amd64
- name: Audit Docker image for arm64
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
run: ./script/release-workflow/audit.sh
env:
DOCKER_TARGET_PLATFORM: linux/arm64
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ADD docker/pact /usr/local/bin/pact
RUN apk update \
&& apk add ruby=3.3.6-r0 \
ruby-io-console=3.3.6-r0 \
ca-certificates=20240705-r0 \
ca-certificates=20241121-r1 \
libressl \
less \
git \
Expand Down

0 comments on commit fd19250

Please sign in to comment.