diff --git a/.circleci/config.yml b/.circleci/config.yml index 590c04544..bf95c053b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ orbs: executors: go_cimg: docker: - - image: cimg/go:1.24.9 + - image: cimg/go:1.25 resource_class: large local_cluster_test_executor: diff --git a/Dockerfile.ci-test b/Dockerfile.ci-test index a61073589..6468f5f57 100644 --- a/Dockerfile.ci-test +++ b/Dockerfile.ci-test @@ -1,4 +1,4 @@ -ARG GO_IMAGE_BASE_TAG=1.24 +ARG GO_IMAGE_BASE_TAG=1.25 FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_BASE_TAG} AS builder ARG TARGETOS diff --git a/Dockerfile.cli b/Dockerfile.cli index c8ee68352..c18dbf13d 100644 --- a/Dockerfile.cli +++ b/Dockerfile.cli @@ -1,4 +1,4 @@ -ARG GO_IMAGE_BASE_TAG=1.24 +ARG GO_IMAGE_BASE_TAG=1.25 FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_BASE_TAG} AS builder ARG TARGETARCH diff --git a/Dockerfile.controller b/Dockerfile.controller index b17e3c109..a610a7235 100644 --- a/Dockerfile.controller +++ b/Dockerfile.controller @@ -1,4 +1,4 @@ -ARG GO_IMAGE_BASE_TAG=1.24 +ARG GO_IMAGE_BASE_TAG=1.25 FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_BASE_TAG} AS builder ARG TARGETARCH diff --git a/Dockerfile.kube-adaptor b/Dockerfile.kube-adaptor index 3a2307507..f54a91c2b 100644 --- a/Dockerfile.kube-adaptor +++ b/Dockerfile.kube-adaptor @@ -1,4 +1,4 @@ -ARG GO_IMAGE_BASE_TAG=1.24 +ARG GO_IMAGE_BASE_TAG=1.25 FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_BASE_TAG} AS builder ARG TARGETARCH diff --git a/Dockerfile.network-observer b/Dockerfile.network-observer index 6e628bdec..2b79d20fc 100644 --- a/Dockerfile.network-observer +++ b/Dockerfile.network-observer @@ -1,4 +1,4 @@ -ARG GO_IMAGE_BASE_TAG=1.24 +ARG GO_IMAGE_BASE_TAG=1.25 ARG CONSOLE_VERSION=development FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_BASE_TAG} AS builder diff --git a/Dockerfile.system-controller b/Dockerfile.system-controller index 3ed00272e..086d71da8 100644 --- a/Dockerfile.system-controller +++ b/Dockerfile.system-controller @@ -1,4 +1,4 @@ -ARG GO_IMAGE_BASE_TAG=1.24 +ARG GO_IMAGE_BASE_TAG=1.25 FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_BASE_TAG} AS builder ARG TARGETARCH diff --git a/Makefile b/Makefile index 9100bf719..8e1c0688f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ IMAGE_TAG := v2-dev ROUTER_IMAGE_TAG := main PLATFORMS ?= linux/amd64,linux/arm64 CONTAINERFILES := Dockerfile.cli Dockerfile.kube-adaptor Dockerfile.controller Dockerfile.network-observer Dockerfile.system-controller -GO_IMAGE_BASE_TAG := 1.24.9 +GO_IMAGE_BASE_TAG := 1.25 SHARED_IMAGE_LABELS = \ --label "org.opencontainers.image.created=$(shell TZ=GMT date --iso-8601=seconds)" \ --label "org.opencontainers.image.url=https://skupper.io/" \ diff --git a/doc/develop/code_generation.md b/doc/develop/code_generation.md index c64788f4e..2fbb752ba 100644 --- a/doc/develop/code_generation.md +++ b/doc/develop/code_generation.md @@ -22,7 +22,7 @@ In an abundance of caution to avoid contamination from the dev host, we suggest running in a container. Example: ``` -GO_VERSION=1.24.9 +GO_VERSION=1.25 podman run -v $(pwd):/work:rw,Z \ -w /work \ diff --git a/go.mod b/go.mod index 9772ec8bd..b3af25de2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/skupperproject/skupper -go 1.24.0 - -toolchain go1.24.9 +go 1.25.0 require ( github.com/Azure/go-amqp v1.0.5