Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.9
3.4.10
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ruby:3.4.9-alpine3.23 AS base
FROM ruby:3.4.10-alpine3.24 AS base

# 1. Install target specfic dependencies
# - gcompat required for arm/arm64 (otherwise nokogiri breaks when viewing network graph)
# - https://github.com/sparklemotion/nokogiri/issues/2414
# 2. Supercronic - setup sha1sum for each supported architecture
FROM base AS base-amd64
ENV SUPERCRONIC_SHA1SUM=5bcefed628e32adc08e32634db2d10e9230dbca0
ENV SUPERCRONIC_SHA1SUM=712d2ece75da6f6e530192a151488578153e4e96
FROM base AS base-arm64
ENV SUPERCRONIC_SHA1SUM=639ab81a72771990790df7ee87d9acfe88e5fa83
ENV SUPERCRONIC_SHA1SUM=93323899ddca3f1198f1796a4bf4418ed1e7982e
RUN apk add --update --no-cache gcompat
FROM base AS base-arm
ENV SUPERCRONIC_SHA1SUM=04be50a960eafa325185d037c9b4ad6cd88a0e0b
ENV SUPERCRONIC_SHA1SUM=dcc8535b46bd9752fbbe177fddd7f6f0451da9a4
RUN apk add --update --no-cache gcompat

# Supercronic - use base-$TARGETARCH to select correct base image SUPERCRONIC_SHA1SUM
Expand All @@ -19,7 +19,7 @@ FROM base-$TARGETARCH AS pb-dev

# Install Supercronic
ARG TARGETARCH
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.46/supercronic-linux-${TARGETARCH} \
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.47/supercronic-linux-${TARGETARCH} \
SUPERCRONIC=supercronic-linux-${TARGETARCH}
RUN wget "$SUPERCRONIC_URL" \
&& echo "${SUPERCRONIC_SHA1SUM} ${SUPERCRONIC}" | sha1sum -c - \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-bundle-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.4.9-alpine3.23
FROM ruby:3.4.10-alpine3.24

# Installation path
ENV HOME=/pact_broker
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-package-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.4.9-alpine3.23
FROM ruby:3.4.10-alpine3.24

# Installation path
ENV HOME=/app
Expand Down
2 changes: 1 addition & 1 deletion pact_broker/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.9
3.4.10
30 changes: 16 additions & 14 deletions script/.trivyignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Ruby Std Gems
CVE-2026-41316
CVE-2026-42257
CVE-2026-42258
CVE-2026-42245
CVE-2026-42246
CVE-2026-42256
CVE-2026-47240
CVE-2026-47242
CVE-2026-47241
# supercronic
CVE-2026-42504
CVE-2026-27145
CVE-2026-42507
CVE-2026-39822
CVE-2026-42505
GHSA-6jxj-px6v-747w
GHSA-6wmf-3r64-vcwv
GHSA-8vfg-2r28-hvhj
GHSA-wwpr-jff3-395c
CVE-2026-54696
GHSA-5prr-v3j2-97mh
GHSA-5v8h-3h3q-446p
GHSA-8678-w3jw-xfc2
GHSA-9cv2-cfxc-v4v2
GHSA-p67v-3w7g-wjg7
GHSA-phwj-rprq-35pp
GHSA-wfpw-mmfh-qq69
GHSA-wjv4-x9w8-wm3h
GHSA-g9g8-vgvw-g3vf