From 7e2f813438ec879beae4e7c7da866e130439607f Mon Sep 17 00:00:00 2001 From: jarek Date: Wed, 19 Aug 2026 14:26:45 +0200 Subject: [PATCH] security: update Go to 1.25.13 (8 HIGH stdlib CVEs) and update docker-compose to 5.5.0 --- Dockerfile | 4 ++-- Dockerfile.baseline | 2 +- Dockerfile.riscv64 | 2 +- collector/go.mod | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7fe9ca..ac1544f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN APKO_ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "x86_64") " - busybox" \ " - tzdata" \ " - docker-cli" \ - " - docker-compose=5.3.1-r3" \ + " - docker-compose=5.5.0-r0" \ " - docker-cli-buildx" \ " - sqlite" \ " - postgresql-client" \ @@ -99,7 +99,7 @@ RUN cp -r node_modules/better-sqlite3/build /tmp/better-sqlite3-build \ && rm -rf node_modules/@types /tmp/better-sqlite3-build # Build Go collector -FROM --platform=$BUILDPLATFORM golang:1.25.12 AS go-builder +FROM --platform=$BUILDPLATFORM golang:1.25.13 AS go-builder ARG TARGETARCH WORKDIR /app COPY collector/ ./collector/ diff --git a/Dockerfile.baseline b/Dockerfile.baseline index b2d678e..4ea9b4d 100644 --- a/Dockerfile.baseline +++ b/Dockerfile.baseline @@ -46,7 +46,7 @@ RUN cp -r node_modules/better-sqlite3/build /tmp/better-sqlite3-build \ # ----------------------------------------------------------------------------- # Stage 2: Go Collector Builder # ----------------------------------------------------------------------------- -FROM golang:1.25.12 AS go-builder +FROM golang:1.25.13 AS go-builder WORKDIR /app COPY collector/ ./collector/ RUN cd collector && CGO_ENABLED=0 go build -o /app/bin/collection-worker . diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index d8f9a4e..5bdc21a 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -72,7 +72,7 @@ RUN MAKEFLAGS="-j$(nproc)" npm ci --omit=dev --ignore-scripts \ # ----------------------------------------------------------------------------- # Stage 4: Go Collector Builder (cross-compile from build platform) # ----------------------------------------------------------------------------- -FROM --platform=$BUILDPLATFORM golang:1.25.9 AS go-builder +FROM --platform=$BUILDPLATFORM golang:1.25.13 AS go-builder ARG TARGETARCH WORKDIR /app COPY collector/ ./collector/ diff --git a/collector/go.mod b/collector/go.mod index 7bd833b..a08997a 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -1,3 +1,3 @@ module github.com/Finsys/dockhand/collector -go 1.25.12 +go 1.25.13