diff --git a/Dockerfile b/Dockerfile index 2672e64d..924884bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:22.10 AS user # Create a nonroot user for final image RUN useradd -u 10001 nonroot -FROM golang:1.26.2-alpine3.22 AS builder +FROM golang:1.26.3-alpine3.22 AS builder WORKDIR /workspace @@ -31,7 +31,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \ -X \"github.com/pluralsh/plural-cli/pkg/common.Date=${APP_DATE}\"" \ -o plural ./cmd/plural -FROM golang:1.26.2-alpine3.22 AS final +FROM golang:1.26.3-alpine3.22 AS final WORKDIR / diff --git a/go.mod b/go.mod index 42515184..fdca168a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pluralsh/plural-cli -go 1.26.2 +go 1.26.3 require ( cloud.google.com/go/compute v1.54.0 diff --git a/hack/gen-client-mocks.sh b/hack/gen-client-mocks.sh index a7830e92..56103562 100755 --- a/hack/gen-client-mocks.sh +++ b/hack/gen-client-mocks.sh @@ -6,7 +6,7 @@ cd $(dirname $0)/.. source hack/lib.sh -CONTAINERIZE_IMAGE=golang:1.25.1 containerize ./hack/gen-client-mocks.sh +CONTAINERIZE_IMAGE=golang:1.26.3 containerize ./hack/gen-client-mocks.sh go run github.com/vektra/mockery/v2@latest --dir=pkg/api/ --name=Client --output=pkg/test/mocks go run github.com/vektra/mockery/v2@latest --dir=pkg/kubernetes --name=Kube --output=pkg/test/mocks diff --git a/hack/lib.sh b/hack/lib.sh index 9bc3e853..175fd544 100644 --- a/hack/lib.sh +++ b/hack/lib.sh @@ -7,7 +7,7 @@ echodate() { containerize() { local cmd="$1" - local image="${CONTAINERIZE_IMAGE:-golang:1.18.4}" + local image="${CONTAINERIZE_IMAGE:-golang:1.26.3}" local gocache="${CONTAINERIZE_GOCACHE:-/tmp/.gocache}" local gomodcache="${CONTAINERIZE_GOMODCACHE:-/tmp/.gomodcache}" local skip="${NO_CONTAINERIZE:-}" diff --git a/test.Dockerfile b/test.Dockerfile index 09b04840..723e0783 100644 --- a/test.Dockerfile +++ b/test.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.7-bookworm +FROM golang:1.26.3-bookworm RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \