From 059b125ea35de79c2a7d5b93a1cc5008f41e7db1 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Wed, 8 Jul 2026 13:56:32 +0100 Subject: [PATCH 1/2] chore(deps): update ruby 3.4.10 / supercronic 0.2.47 --- .ruby-version | 2 +- Dockerfile | 10 +++++----- Dockerfile-bundle-base | 2 +- Dockerfile-package-base | 2 +- pact_broker/.ruby-version | 2 +- script/.trivyignore | 14 -------------- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.ruby-version b/.ruby-version index e0940d40..34876073 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.9 \ No newline at end of file +3.4.10 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 010cb482..8989468c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 - \ diff --git a/Dockerfile-bundle-base b/Dockerfile-bundle-base index ab29f185..b2fa5da3 100644 --- a/Dockerfile-bundle-base +++ b/Dockerfile-bundle-base @@ -1,4 +1,4 @@ -FROM ruby:3.4.9-alpine3.23 +FROM ruby:3.4.10-alpine3.24 # Installation path ENV HOME=/pact_broker diff --git a/Dockerfile-package-base b/Dockerfile-package-base index 8c4a1cc7..50cd3a46 100644 --- a/Dockerfile-package-base +++ b/Dockerfile-package-base @@ -1,4 +1,4 @@ -FROM ruby:3.4.9-alpine3.23 +FROM ruby:3.4.10-alpine3.24 # Installation path ENV HOME=/app diff --git a/pact_broker/.ruby-version b/pact_broker/.ruby-version index e0940d40..34876073 100644 --- a/pact_broker/.ruby-version +++ b/pact_broker/.ruby-version @@ -1 +1 @@ -3.4.9 \ No newline at end of file +3.4.10 \ No newline at end of file diff --git a/script/.trivyignore b/script/.trivyignore index e14794ce..e69de29b 100644 --- a/script/.trivyignore +++ b/script/.trivyignore @@ -1,14 +0,0 @@ -# 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 \ No newline at end of file From 453ddaa0547830fb13c9818db914d2f2634f4d0c Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Wed, 8 Jul 2026 14:31:08 +0100 Subject: [PATCH 2/2] chore(deps): add new round of cve exceptions --- script/.trivyignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/script/.trivyignore b/script/.trivyignore index e69de29b..f8b3ccc2 100644 --- a/script/.trivyignore +++ b/script/.trivyignore @@ -0,0 +1,16 @@ +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 \ No newline at end of file