From 1522c51407f7195da9bed3e475cf7f96c9b86077 Mon Sep 17 00:00:00 2001 From: apikey Date: Thu, 9 Jul 2026 10:14:16 +0000 Subject: [PATCH] fix: remediate console image go vulnerabilities --- Dockerfile | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- hack/gen-client-mocks.sh | 2 +- hack/lib.sh | 2 +- test.Dockerfile | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index abe596a4..c108fc3b 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.4-alpine3.22 AS builder +FROM golang:1.26.5-alpine 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.4-alpine3.22 AS final +FROM golang:1.26.5-alpine AS final WORKDIR / diff --git a/go.mod b/go.mod index 219b2d26..593b80cc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pluralsh/plural-cli -go 1.26.4 +go 1.26.5 require ( cloud.google.com/go/compute v1.64.0 @@ -31,7 +31,7 @@ require ( github.com/fatih/color v1.19.0 github.com/go-git/go-git/v5 v5.19.1 github.com/gofrs/flock v0.13.0 - github.com/google/go-containerregistry v0.21.7 + github.com/google/go-containerregistry v0.21.8-0.20260624172245-e8b2b9e51df6 github.com/google/go-github/v45 v45.2.0 github.com/hashicorp/go-bexpr v0.1.16 github.com/ktrysmt/go-bitbucket v0.10.0 diff --git a/go.sum b/go.sum index d5229173..27b4040a 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7O github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/go-containerregistry v0.21.7 h1:/vPFuVXDjtFREsVArW+0h1CIl5urnOhzei4X2DMW9IU= -github.com/google/go-containerregistry v0.21.7/go.mod h1:kjSbt7/zMsKLWfnHrIvKvhXHUw91jbe9DNjPPJ32gXE= +github.com/google/go-containerregistry v0.21.8-0.20260624172245-e8b2b9e51df6 h1:bpByubJ4Ayw0g41IbJiOlRmPzUqgoSjRqlPlYMeq5zs= +github.com/google/go-containerregistry v0.21.8-0.20260624172245-e8b2b9e51df6/go.mod h1:tBa8nvqX7DegB3fIHf+ufc9YLdVRpRZnitenQSTApEA= github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI= github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28= github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= diff --git a/hack/gen-client-mocks.sh b/hack/gen-client-mocks.sh index fe987703..ff18b757 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.26.4 containerize ./hack/gen-client-mocks.sh +CONTAINERIZE_IMAGE=golang:1.26.5 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 c597b7d8..7d13dcc5 100644 --- a/hack/lib.sh +++ b/hack/lib.sh @@ -7,7 +7,7 @@ echodate() { containerize() { local cmd="$1" - local image="${CONTAINERIZE_IMAGE:-golang:1.26.4}" + local image="${CONTAINERIZE_IMAGE:-golang:1.26.5}" 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 904da035..337300cc 100644 --- a/test.Dockerfile +++ b/test.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.4-bookworm +FROM golang:1.26.5-bookworm RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \