Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump alpine from 3.19.1 to 3.20.0 #3018

Merged
merged 2 commits into from
May 27, 2024
Merged
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.buf
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.workspace
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine3.19
FROM golang:1.22-alpine3.20

ARG PROJECT
ARG GO_MODULE
Expand Down
2 changes: 1 addition & 1 deletion make/buf/all.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM alpine:3.19.1
FROM alpine:3.20.0

RUN echo "success"