diff --git a/Dockerfile.buf b/Dockerfile.buf index f9418bdb14..721a5e75f7 100644 --- a/Dockerfile.buf +++ b/Dockerfile.buf @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.19 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.20 as builder WORKDIR /workspace @@ -13,7 +13,7 @@ ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \ go build -ldflags "-s -w" -trimpath -buildvcs=false -o /go/bin/buf ./cmd/buf -FROM --platform=${TARGETPLATFORM} alpine:3.19.1 +FROM --platform=${TARGETPLATFORM} alpine:3.20.0 RUN apk add --update --no-cache \ ca-certificates \ diff --git a/Dockerfile.workspace b/Dockerfile.workspace index 2e55768a1b..40bb300445 100644 --- a/Dockerfile.workspace +++ b/Dockerfile.workspace @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine3.19 +FROM golang:1.22-alpine3.20 ARG PROJECT ARG GO_MODULE diff --git a/make/buf/all.mk b/make/buf/all.mk index 74aa0e71fb..34b298b202 100644 --- a/make/buf/all.mk +++ b/make/buf/all.mk @@ -185,7 +185,7 @@ endif # make sure both of these docker images exist # the release of these images will lag the actual release docker pull golang:$(GOVERSION)-bookworm - docker pull golang:$(GOVERSION)-alpine3.19 + docker pull golang:$(GOVERSION)-alpine3.20 $(SED_I) "s/golang:1\.[0-9][0-9]*/golang:$(GOVERSION)/g" $(shell git-ls-files-unstaged | grep Dockerfile) $(SED_I) "s/golang:1\.[0-9][0-9]*/golang:$(GOVERSION)/g" $(shell git-ls-files-unstaged | grep \.mk$) $(SED_I) "s/go-version: '1\.[0-9][0-9].x'/go-version: '$(GOVERSION).x'/g" $(shell git-ls-files-unstaged | grep \.github\/workflows | grep -v previous.yaml) diff --git a/private/bufpkg/bufplugin/bufplugindocker/testdata/success/Dockerfile b/private/bufpkg/bufplugin/bufplugindocker/testdata/success/Dockerfile index 7be5bacafb..149988154b 100644 --- a/private/bufpkg/bufplugin/bufplugindocker/testdata/success/Dockerfile +++ b/private/bufpkg/bufplugin/bufplugindocker/testdata/success/Dockerfile @@ -1,3 +1,3 @@ -FROM alpine:3.19.1 +FROM alpine:3.20.0 RUN echo "success"