diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ad6054e5be..bb01e84bbb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * [ENHANCEMENT] Compactor: Avoid double compaction by cleaning partition files in 2 cycles. #7129 * [ENHANCEMENT] Distributor: Optimize memory usage by recycling v2 requests. #7131 * [ENHANCEMENT] Compactor: Avoid double compaction by not filtering delete blocks on real time when using bucketIndex lister. #7156 +* [ENHANCEMENT] Upgraded container base images to `alpine:3.23`. #7163 * [BUGFIX] Ring: Change DynamoDB KV to retry indefinitely for WatchKey. #7088 * [BUGFIX] Ruler: Add XFunctions validation support. #7111 * [BUGFIX] Querier: propagate Prometheus info annotations in protobuf responses. #7132 diff --git a/cmd/cortex/Dockerfile b/cmd/cortex/Dockerfile index 64fadb8840c..dd0f81fe9ac 100644 --- a/cmd/cortex/Dockerfile +++ b/cmd/cortex/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 ARG TARGETARCH RUN apk add --no-cache ca-certificates diff --git a/cmd/query-tee/Dockerfile b/cmd/query-tee/Dockerfile index 4b3d9f5c3ce..da1ddeda265 100644 --- a/cmd/query-tee/Dockerfile +++ b/cmd/query-tee/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 ARG TARGETARCH RUN apk add --no-cache ca-certificates diff --git a/cmd/test-exporter/Dockerfile b/cmd/test-exporter/Dockerfile index 8016612157a..c6cd51145d4 100644 --- a/cmd/test-exporter/Dockerfile +++ b/cmd/test-exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 ARG TARGETARCH RUN apk add --no-cache ca-certificates COPY test-exporter-$TARGETARCH /test-exporter diff --git a/cmd/thanosconvert/Dockerfile b/cmd/thanosconvert/Dockerfile index 67f33267e14..fe775c3c549 100644 --- a/cmd/thanosconvert/Dockerfile +++ b/cmd/thanosconvert/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 ARG TARGETARCH RUN apk add --no-cache ca-certificates COPY thanosconvert-$TARGETARCH /thanosconvert diff --git a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile index acc34126d34..d47c7d13adf 100644 --- a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19 ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@latest -FROM alpine:3.18 +FROM alpine:3.23 RUN mkdir /cortex WORKDIR /cortex diff --git a/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile b/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile index 7ed184ff964..55111d7a400 100644 --- a/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 RUN mkdir /cortex WORKDIR /cortex diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile index 4566c8dafb3..d47c7d13adf 100644 --- a/development/tsdb-blocks-storage-s3/dev.dockerfile +++ b/development/tsdb-blocks-storage-s3/dev.dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19 ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@latest -FROM alpine:3.19 +FROM alpine:3.23 RUN mkdir /cortex WORKDIR /cortex diff --git a/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile b/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile index 7ed184ff964..55111d7a400 100644 --- a/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile +++ b/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 RUN mkdir /cortex WORKDIR /cortex diff --git a/packaging/fpm/Dockerfile b/packaging/fpm/Dockerfile index d23747230c7..2b32eea23d4 100644 --- a/packaging/fpm/Dockerfile +++ b/packaging/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.23 RUN apk add --no-cache \ ruby \