Skip to content
Closed
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
5 changes: 4 additions & 1 deletion src/shadowbox/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, we don't have to over-index in vulnerability scanners if they are not exploitable. There's a ton of false-positives. I would imagine that a new node image would address that. Why don't you upgrade the node image instead?

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 . /

Expand Down
10 changes: 5 additions & 5 deletions third_party/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ tasks:
prometheus:download-*-*:
desc: Download and extract prometheus binary
vars:
VERSION: '2.53.4'
VERSION: '3.5.3'

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a major version change. Will it be able to read the v2 data? If so, we need a migration step.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah, it does require at least thinking through the implications of https://prometheus.io/docs/prometheus/latest/migration/

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}}'
Expand Down
12 changes: 6 additions & 6 deletions third_party/prometheus/METADATA
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading