From c12f9fec143afc97f24c2d321e4dcd72be9b3f82 Mon Sep 17 00:00:00 2001 From: Jarek Krochmalski Date: Mon, 14 Sep 2026 09:03:50 +0200 Subject: [PATCH] update go and docker-compose builder pins --- Dockerfile | 4 ++-- Dockerfile.baseline | 2 +- Dockerfile.riscv64 | 4 ++-- collector/go.mod | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56b401a..9df6028 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.5.0-r2" \ + " - docker-compose=5.5.0-r5" \ " - 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.13 AS go-builder +FROM --platform=$BUILDPLATFORM golang:1.26.8 AS go-builder ARG TARGETARCH WORKDIR /app COPY collector/ ./collector/ diff --git a/Dockerfile.baseline b/Dockerfile.baseline index 4ea9b4d..8c88a22 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.13 AS go-builder +FROM golang:1.26.8 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 5bdc21a..98464f4 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -23,7 +23,7 @@ # ----------------------------------------------------------------------------- # Alpine edge has docker-cli for riscv64 but NOT docker-compose. # Build it from source since Go has excellent riscv64 cross-compilation. -FROM --platform=$BUILDPLATFORM golang:1.25.9-alpine AS compose-builder +FROM --platform=$BUILDPLATFORM golang:1.26.8-alpine AS compose-builder ARG TARGETARCH RUN apk add --no-cache git @@ -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.13 AS go-builder +FROM --platform=$BUILDPLATFORM golang:1.26.8 AS go-builder ARG TARGETARCH WORKDIR /app COPY collector/ ./collector/ diff --git a/collector/go.mod b/collector/go.mod index a08997a..afbcc85 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -1,3 +1,3 @@ module github.com/Finsys/dockhand/collector -go 1.25.13 +go 1.26