Merge pull request fabiolb#966 from aleksraiden/alpine3.21-update

Use Alpine3.21 as base docker image
vapopov · Feb 4, 2025 · 9e411f3 · 9e411f3
2 parents 9571452 + 4ae4c38
commit 9e411f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-FROM golang:1.23-alpine3.20 AS build
+FROM golang:1.23-alpine3.21 AS build
 
 ARG consul_version=1.20.2
 ADD https://releases.hashicorp.com/consul/${consul_version}/consul_${consul_version}_linux_amd64.zip /usr/local/bin
-RUN cd /usr/local/bin && unzip consul_${consul_version}_linux_amd64.zip
+RUN cd /usr/local/bin && unzip consul_${consul_version}_linux_amd64.zip consul
 
 ARG vault_version=1.18.4
 ADD https://releases.hashicorp.com/vault/${vault_version}/vault_${vault_version}_linux_amd64.zip /usr/local/bin
@@ -16,7 +16,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -trimpath -ldflags "-s -w" ./.
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags "-s -w"
 RUN setcap cap_net_bind_service=+ep /src/fabio
 
-FROM alpine:3.20
+FROM alpine:3.21
 RUN apk update && apk add --no-cache ca-certificates
 COPY --from=build /src/fabio /usr/bin
 COPY --chown=nobody:nogroup fabio.properties /etc/fabio/fabio.properties

diff --git a/Dockerfile-goreleaser b/Dockerfile-goreleaser
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 RUN apk update && apk add --no-cache ca-certificates
 COPY fabio /usr/bin
 ADD fabio.properties /etc/fabio/fabio.properties