Upgrade Alpine to 3.18 (cortexproject#5684)

dsabsay · Daniel Sabsay · yeya24 · commit b9a07ebdb870 · 2024-04-23T10:52:06.000-07:00
* Upgrade Alpine to 3.18

Signed-off-by: Daniel Sabsay &lt;sabsay@adobe.com&gt;

* Update CHANGELOG.md

Signed-off-by: Daniel Sabsay &lt;sabsay@adobe.com&gt;

---------

Signed-off-by: Daniel Sabsay &lt;sabsay@adobe.com&gt;
Co-authored-by: Daniel Sabsay &lt;sabsay@adobe.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master / unreleased
 
+## 1.16.1 2024-04-23
+
+* [ENHANCEMENT] Upgraded Docker base images to `alpine:3.18`. #5684
+
 ## 1.16.0 2023-11-20
 
 * [CHANGE] AlertManager: include reason label in `cortex_alertmanager_notifications_failed_total`. #5409
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.16.0
+1.16.1
diff --git a/cmd/cortex/Dockerfile b/cmd/cortex/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.17
+FROM       alpine:3.18
 ARG TARGETARCH
 
 RUN        apk add --no-cache ca-certificates
diff --git a/cmd/query-tee/Dockerfile b/cmd/query-tee/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.17
+FROM       alpine:3.18
 ARG TARGETARCH
 
 RUN        apk add --no-cache ca-certificates
diff --git a/cmd/test-exporter/Dockerfile b/cmd/test-exporter/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.17
+FROM       alpine:3.18
 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
@@ -1,4 +1,4 @@
-FROM       alpine:3.17
+FROM       alpine:3.18
 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
@@ -2,7 +2,7 @@ FROM golang:1.18
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 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
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN     mkdir /cortex
 WORKDIR /cortex
diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile
@@ -2,7 +2,7 @@ FROM golang:1.18
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 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
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN     mkdir /cortex
 WORKDIR /cortex
diff --git a/packaging/fpm/Dockerfile b/packaging/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN apk add --no-cache \
         ruby \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.17`
	`1`	`+FROM alpine:3.18`
`2`	`2`	`ARG TARGETARCH`
`3`	`3`
`4`	`4`	`RUN apk add --no-cache ca-certificates`