From d1a720405a4c36a833e43a6171dc7f41cbf550c8 Mon Sep 17 00:00:00 2001 From: Sarah Laplante Date: Mon, 11 May 2026 13:11:30 +0200 Subject: [PATCH] lib upgrades for trivy issues --- src/shadowbox/docker/Dockerfile | 5 ++++- third_party/Taskfile.yml | 10 +++++----- third_party/prometheus/METADATA | 12 ++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/shadowbox/docker/Dockerfile b/src/shadowbox/docker/Dockerfile index 8afa5f33..85e0cc7a 100644 --- a/src/shadowbox/docker/Dockerfile +++ b/src/shadowbox/docker/Dockerfile @@ -28,7 +28,10 @@ STOPSIGNAL SIGKILL # Upgrade installed Alpine packages to pick up security fixes (musl-utils, busybox, ssl_client, etc.). # We use curl to detect the server's public IP. We need to use the --date option in `date` to # safely grab the ip-to-country database. -RUN apk upgrade --no-cache && apk add --no-cache --upgrade coreutils curl +# Remove npm/npx CLI — the runtime only invokes `node`, and npm ships old transitive deps that +# trip image vulnerability scanners. +RUN apk upgrade --no-cache && apk add --no-cache --upgrade coreutils curl \ + && rm -rf /usr/local/lib/node_modules/npm /usr/local/bin/npm /usr/local/bin/npx COPY . / diff --git a/third_party/Taskfile.yml b/third_party/Taskfile.yml index bdcc6807..0cb23fb4 100644 --- a/third_party/Taskfile.yml +++ b/third_party/Taskfile.yml @@ -11,16 +11,16 @@ tasks: prometheus:download-*-*: desc: Download and extract prometheus binary vars: - VERSION: '2.53.4' + VERSION: '3.5.3' GOOS: '{{index .MATCH 0}}' GOARCH: '{{index .MATCH 1}}' TEMPFILE: {sh: mktemp} SHA256: '{{printf "%v/%v" .GOOS .GOARCH | get (dict - "linux/amd64" "b8b497c4610d1b93208252b60c8f20f6b2e78596ae8df43397a2e805aa53d475" - "linux/arm64" "ec7236ecea7154d0bfe142921708b1ae7b5e921e100e0ee85ab92b7c444357e0" - "darwin/amd64" "10066a1aa21c4ddb8d5e61c31b52e898d8ac42c7e99fd757e2fc4b6c20b8075f" - "darwin/arm64" "cb3e638d8e9b4b27a6aa1f45a4faa3741b548aac67d4649aea7a2fad3c09f0a1" + "linux/amd64" "8c30b9d99664e39b0363c0ba54fab30a7958e9d3de27246bf26ed85e6cfb8946" + "linux/arm64" "11457bc76cab34f5ac05ba05fb80cfca1e8be7e4b31ae7c054879ce1066cb9a5" + "darwin/amd64" "408eec9f1138ad5d30509038b2e8ae798ed2910e7faaa0e7f61ca22db222aaf5" + "darwin/arm64" "1883df59fbea254b2e3f112feb6406533be7c062aef20f5d0b40b9e9acdb77e2" ) }}' TARGET_DIR: '{{joinPath .OUTPUT_BASE "prometheus" .GOOS .GOARCH}}' diff --git a/third_party/prometheus/METADATA b/third_party/prometheus/METADATA index 4712de71..ce1c8484 100644 --- a/third_party/prometheus/METADATA +++ b/third_party/prometheus/METADATA @@ -10,21 +10,21 @@ third_party { } url { type: ARCHIVE - value: "https://github.com/prometheus/prometheus/releases/download/v2.53.4/prometheus-2.53.4.linux-amd64.tar.gz" + value: "https://github.com/prometheus/prometheus/releases/download/v3.5.3/prometheus-3.5.3.linux-amd64.tar.gz" } url { type: ARCHIVE - value: "https://github.com/prometheus/prometheus/releases/download/v2.53.4/prometheus-2.53.4.linux-arm64.tar.gz" + value: "https://github.com/prometheus/prometheus/releases/download/v3.5.3/prometheus-3.5.3.linux-arm64.tar.gz" } url { type: ARCHIVE - value: "https://github.com/prometheus/prometheus/releases/download/v2.53.4/prometheus-2.53.4.darwin-amd64.tar.gz" + value: "https://github.com/prometheus/prometheus/releases/download/v3.5.3/prometheus-3.5.3.darwin-amd64.tar.gz" } url { type: ARCHIVE - value: "https://github.com/prometheus/prometheus/releases/download/v2.53.4/prometheus-2.53.4.darwin-arm64.tar.gz" + value: "https://github.com/prometheus/prometheus/releases/download/v3.5.3/prometheus-3.5.3.darwin-arm64.tar.gz" } - version: "2.53.4" - last_upgrade_date { year: 2025 month: 3 day: 20 } + version: "3.5.3" + last_upgrade_date { year: 2026 month: 5 day: 11 } license_type: PERMISSIVE }