Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 The previous tag golang:1.26.4-alpine3.22 pinned both the Go version and the Alpine minor version, ensuring reproducible builds regardless of when the image is pulled. Dropping to the unqualified alpine tag means the Alpine OS version can silently advance if the tag is updated upstream or the image is pulled fresh in a new environment. test.Dockerfile retained -bookworm for the same reason, so keeping the Alpine minor version here would be consistent. Check Docker Hub to confirm the correct tag (e.g. golang:1.26.5-alpine3.22) and apply it to both stages.

Suggested change
FROM golang:1.26.5-alpine AS builder
FROM golang:1.26.5-alpine3.22 AS builder

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!


WORKDIR /workspace

Expand Down Expand Up @@ -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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Same Alpine version pin concern as the builder stage — the final stage should match.

Suggested change
FROM golang:1.26.5-alpine AS final
FROM golang:1.26.5-alpine3.22 AS final

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!


WORKDIR /

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion hack/gen-client-mocks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:-}"
Expand Down
2 changes: 1 addition & 1 deletion test.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
Loading