Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update ca-certs / use arm builder for audit #145

Merged
merged 3 commits into from
Jan 20, 2025
Merged

chore: update ca-certs / use arm builder for audit #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
042cfe2
chore: update ca-certs / use arm builder for audit
YOU54F Jan 20, 2025
7589ff2
ci: audit on ubuntu-24.04-arm runner
YOU54F Jan 20, 2025
06c12f8
ci: audit on ubuntu-24.04-arm runner
YOU54F Jan 20, 2025
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
22 changes: 11 additions & 11 deletions .github/workflows/audit.yml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ GEM
specs:
awesome_print (1.9.2)
base64 (0.2.0)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
bump (0.10.0)
coderay (1.1.3)
csv (3.3.0)
Expand All @@ -52,7 +52,7 @@ GEM
csv
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
json (2.9.0)
json (2.9.1)
jsonpath (1.1.5)
multi_json
logger (1.6.2)
Expand Down
Loading