From 7fd126a7a40fe4436ce062eb68d7d3cca9b0f9ae Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 17 Dec 2025 17:37:28 -0500 Subject: [PATCH 1/2] go 1.25, debian trixie --- .circleci/config.yml | 16 ++++++++-------- Dockerfile | 2 +- Makefile | 6 +++--- deploy/Dockerfile-base | 2 +- go.mod | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b2cee46..b72ad761 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: docs: docker: - - image: cimg/go:1.23 + - image: cimg/go:1.25 steps: - checkout - run: | @@ -19,14 +19,14 @@ jobs: make pipeline-nointegration test: docker: - - image: cimg/go:1.23 + - image: cimg/go:1.25 steps: - checkout - run: make build-deps ci-test # ci-upload-coverage scan: docker: - - image: cimg/go:1.23 + - image: cimg/go:1.25 steps: - checkout - setup_remote_docker @@ -40,7 +40,7 @@ jobs: machine: true environment: GOPATH: /home/circleci/go - GO_SHA256SUM: d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90 + GO_SHA256SUM: 9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b GO: /usr/local/go/bin/go GOCACHE: "/tmp/go/cache" steps: @@ -49,7 +49,7 @@ jobs: keys: - support-bundle-e2e-build-cache-base - run: | - export GO_DOWNLOAD_URL=https://go.dev/dl/go1.23.12.linux-amd64.tar.gz + export GO_DOWNLOAD_URL=https://go.dev/dl/go1.25.5.linux-amd64.tar.gz export GOPATH=/home/circleci/go export GOROOT=/usr/local/go export PATH=$PATH:$GOROOT/bin:$GOPATH/bin @@ -60,7 +60,7 @@ jobs: tar -zxvf golang.tar.gz -C /tmp sudo rm -rf ${GOROOT} sudo mv /tmp/go ${GOROOT} - - run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.23 -c "sleep infinity" + - run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.25 -c "sleep infinity" - run: | export GOPATH=/home/circleci/go export GOROOT=/usr/local/go @@ -73,7 +73,7 @@ jobs: deploy: docker: - - image: cimg/go:1.23 + - image: cimg/go:1.25 steps: - checkout - setup_remote_docker @@ -85,7 +85,7 @@ jobs: deploy_unstable: docker: - - image: cimg/go:1.23 + - image: cimg/go:1.25 steps: - checkout - setup_remote_docker diff --git a/Dockerfile b/Dockerfile index 8050dc64..60845927 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23 +FROM golang:1.25 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y \ jq \ diff --git a/Makefile b/Makefile index 20e4b55b..1af17a54 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ e2e-supportbundle-core: -v /var/run/docker.sock:/var/run/docker.sock \ -w /go/src/$(PKG) \ -l com.replicated.support-bundle=true \ - golang:1.23 \ + golang:1.25 \ /bin/sh -c " \ ./e2e/collect/e2e.sh \ " @@ -164,7 +164,7 @@ e2e-supportbundle-docker: -w /go/src/$(PKG) \ -l com.replicated.support-bundle=true \ -e DOCKER=1 \ - golang:1.23 \ + golang:1.25 \ /bin/sh -c " \ ./e2e/collect/e2e.sh \ " @@ -178,7 +178,7 @@ e2e-supportbundle-swarm: -w /go/src/$(PKG) \ -l com.replicated.support-bundle=true \ -e SWARM=1 \ - golang:1.23 \ + golang:1.25 \ /bin/sh -c " \ ./e2e/collect/e2e.sh \ " diff --git a/deploy/Dockerfile-base b/deploy/Dockerfile-base index 56c06330..44aaa7c2 100644 --- a/deploy/Dockerfile-base +++ b/deploy/Dockerfile-base @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get upgrade -y && apt-get install --no-install-recommends -y \ ca-certificates \ diff --git a/go.mod b/go.mod index 2bfa2361..5baacb2e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/replicatedcom/support-bundle -go 1.23 +go 1.25 require ( github.com/Masterminds/semver v1.4.2 // indirect From b8455632bc492763f666d15e1ec747fc8e209a8b Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Wed, 17 Dec 2025 17:49:17 -0500 Subject: [PATCH 2/2] fix non-constant format string issues --- pkg/templates/dockerver.go | 2 +- pkg/templates/semver.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/templates/dockerver.go b/pkg/templates/dockerver.go index 1baa69a2..9bcb70cb 100644 --- a/pkg/templates/dockerver.go +++ b/pkg/templates/dockerver.go @@ -16,7 +16,7 @@ func DockerServerVersionCompare(a, b string) int { } bV, err := docker.ParseServerVersion(b) if err != nil { - Panic("dockerServerVersionCompare", errors.Wrapf(err, b)) + Panic("dockerServerVersionCompare", errors.Wrap(err, b)) } return aV.Compare(bV) } diff --git a/pkg/templates/semver.go b/pkg/templates/semver.go index 33e91c93..432c7d1f 100644 --- a/pkg/templates/semver.go +++ b/pkg/templates/semver.go @@ -16,7 +16,7 @@ func SemverCompare(a, b string) int { } bV, err := semver.Parse(b) if err != nil { - Panic("semverCompare", errors.Wrapf(err, b)) + Panic("semverCompare", errors.Wrap(err, b)) } return aV.Compare(bV) }