diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ae6003c032..2f2460d617b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Grafana Mimir * [BUGFIX] Fixed possible series matcher corruption leading to wrong series being included in query results. #6886 +* [ENHANCEMENT] Update Docker base images from `alpine:3.18.3` to `alpine:3.18.5`. #6897 ### Documentation diff --git a/cmd/metaconvert/Dockerfile b/cmd/metaconvert/Dockerfile index a1fadcef2da..9d08f38f238 100644 --- a/cmd/metaconvert/Dockerfile +++ b/cmd/metaconvert/Dockerfile @@ -3,7 +3,7 @@ # Provenance-includes-license: Apache-2.0 # Provenance-includes-copyright: The Cortex Authors. -FROM alpine:3.18.3 +FROM alpine:3.18.5 ARG EXTRA_PACKAGES RUN apk add --no-cache ca-certificates tzdata $EXTRA_PACKAGES # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. diff --git a/cmd/mimir-continuous-test/Dockerfile b/cmd/mimir-continuous-test/Dockerfile index 1b306e0f6d3..04c845739b2 100644 --- a/cmd/mimir-continuous-test/Dockerfile +++ b/cmd/mimir-continuous-test/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: AGPL-3.0-only -FROM alpine:3.18.3 +FROM alpine:3.18.5 ARG EXTRA_PACKAGES RUN apk add --no-cache ca-certificates tzdata $EXTRA_PACKAGES # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. diff --git a/cmd/mimir/Dockerfile b/cmd/mimir/Dockerfile index 1fd859ad802..8931329eb74 100644 --- a/cmd/mimir/Dockerfile +++ b/cmd/mimir/Dockerfile @@ -3,7 +3,7 @@ # Provenance-includes-license: Apache-2.0 # Provenance-includes-copyright: The Cortex Authors. -FROM alpine:3.18.3 +FROM alpine:3.18.5 ARG EXTRA_PACKAGES RUN apk add --no-cache ca-certificates tzdata $EXTRA_PACKAGES # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. diff --git a/cmd/mimirtool/Dockerfile b/cmd/mimirtool/Dockerfile index 744dca165e5..d8747daaca1 100644 --- a/cmd/mimirtool/Dockerfile +++ b/cmd/mimirtool/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -FROM alpine:3.18.3 +FROM alpine:3.18.5 ARG EXTRA_PACKAGES RUN apk add --no-cache ca-certificates tzdata $EXTRA_PACKAGES # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. diff --git a/cmd/query-tee/Dockerfile b/cmd/query-tee/Dockerfile index a26e018a1c8..78d6ce8fede 100644 --- a/cmd/query-tee/Dockerfile +++ b/cmd/query-tee/Dockerfile @@ -3,7 +3,7 @@ # Provenance-includes-license: Apache-2.0 # Provenance-includes-copyright: The Cortex Authors. -FROM alpine:3.18.3 +FROM alpine:3.18.5 ARG EXTRA_PACKAGES RUN apk add --no-cache ca-certificates tzdata $EXTRA_PACKAGES # Expose TARGETOS and TARGETARCH variables. These are supported by Docker when using BuildKit, but must be "enabled" using ARG. diff --git a/development/mimir-microservices-mode/dev.dockerfile b/development/mimir-microservices-mode/dev.dockerfile index dcab909e2de..d6b99f4d2f9 100644 --- a/development/mimir-microservices-mode/dev.dockerfile +++ b/development/mimir-microservices-mode/dev.dockerfile @@ -3,7 +3,7 @@ FROM $BUILD_IMAGE ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.21.0 -FROM alpine:3.18.2 +FROM alpine:3.18.5 RUN mkdir /mimir WORKDIR /mimir diff --git a/development/mimir-monolithic-mode-with-swift-storage/dev.dockerfile b/development/mimir-monolithic-mode-with-swift-storage/dev.dockerfile index 0c63dca01a6..a70fcff6524 100644 --- a/development/mimir-monolithic-mode-with-swift-storage/dev.dockerfile +++ b/development/mimir-monolithic-mode-with-swift-storage/dev.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18.2 +FROM alpine:3.18.5 RUN mkdir /mimir WORKDIR /mimir diff --git a/development/mimir-monolithic-mode/dev.dockerfile b/development/mimir-monolithic-mode/dev.dockerfile index ce710fc10b0..78bb6b87736 100644 --- a/development/mimir-monolithic-mode/dev.dockerfile +++ b/development/mimir-monolithic-mode/dev.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18.3 +FROM alpine:3.18.5 RUN mkdir /mimir WORKDIR /mimir diff --git a/development/mimir-read-write-mode/dev.dockerfile b/development/mimir-read-write-mode/dev.dockerfile index dcab909e2de..d6b99f4d2f9 100644 --- a/development/mimir-read-write-mode/dev.dockerfile +++ b/development/mimir-read-write-mode/dev.dockerfile @@ -3,7 +3,7 @@ FROM $BUILD_IMAGE ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.21.0 -FROM alpine:3.18.2 +FROM alpine:3.18.5 RUN mkdir /mimir WORKDIR /mimir