diff --git a/CHANGELOG.md b/CHANGELOG.md index 242652aab..7358d19c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## main / unreleased * [ENHANCEMENT] Expose pprof endpoint for profiling. #109 +* [ENHANCEMENT] Change Docker build image to `golang:1.21-bookworm` and update base image to `alpine:3.19`. #97 ## v0.10.1 diff --git a/Dockerfile b/Dockerfile index 9b63c127f..cebeb874e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,15 @@ -FROM golang:1.21-alpine3.18 AS build +FROM golang:1.21-bookworm AS build ARG TARGETOS ARG TARGETARCH ARG BUILDTARGET=rollout-operator -RUN apk add --no-cache build-base git - COPY . /src/rollout-operator WORKDIR /src/rollout-operator RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} make ${BUILDTARGET} -FROM alpine:3.18 -RUN apk add --no-cache ca-certificates +FROM alpine:3.19 +RUN apk add --no-cache ca-certificates gcompat COPY --from=build /src/rollout-operator/rollout-operator /bin/rollout-operator ENTRYPOINT [ "/bin/rollout-operator" ] diff --git a/integration/mock-service/Dockerfile b/integration/mock-service/Dockerfile index 7cb568ce6..422d85d60 100644 --- a/integration/mock-service/Dockerfile +++ b/integration/mock-service/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 COPY mock-service /bin/mock-service ENTRYPOINT [ "/bin/mock-service" ]