From db2dcf230e26f57ca7fd050e63793bcc6079a657 Mon Sep 17 00:00:00 2001
From: Daniel Sabsay <sabsay@adobe.com>
Date: Wed, 29 Nov 2023 11:53:18 -0800
Subject: [PATCH] Upgrade Alpine to 3.18

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>
---
 CHANGELOG.md                                                    | 1 +
 cmd/cortex/Dockerfile                                           | 2 +-
 cmd/query-tee/Dockerfile                                        | 2 +-
 cmd/test-exporter/Dockerfile                                    | 2 +-
 cmd/thanosconvert/Dockerfile                                    | 2 +-
 development/tsdb-blocks-storage-s3-gossip/dev.dockerfile        | 2 +-
 development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile | 2 +-
 development/tsdb-blocks-storage-s3/dev.dockerfile               | 2 +-
 .../tsdb-blocks-storage-swift-single-binary/dev.dockerfile      | 2 +-
 packaging/fpm/Dockerfile                                        | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efcf471713..126a0bd9ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * [CHANGE] Index Cache: Multi level cache backfilling operation becomes async. Added `-blocks-storage.bucket-store.index-cache.multilevel.max-async-concurrency` and `-blocks-storage.bucket-store.index-cache.multilevel.max-async-buffer-size` configs and metric `cortex_store_multilevel_index_cache_backfill_dropped_items_total` for number of dropped items. #5661
 * [FEATURE] Ingester: Add per-tenant new metric `cortex_ingester_tsdb_data_replay_duration_seconds`. #5477
 * [ENHANCEMENT] Store Gateway: Added `-store-gateway.enabled-tenants` and `-store-gateway.disabled-tenants` to explicitly enable or disable store-gateway for specific tenants. #5638
+* [ENHANCEMENT] Upgraded Docker base images to `alpine:3.18`.
 
 ## 1.16.0 2023-11-20
 
diff --git a/cmd/cortex/Dockerfile b/cmd/cortex/Dockerfile
index e6604a38d4..28a315d5b9 100644
--- 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
index 53242577b3..cbd5f4558b 100644
--- 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
index 52897f0b86..86460a0600 100644
--- 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
index 80ba01201e..80b1341821 100644
--- 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
index abd818fd3a..e1cf86cb2b 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.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
index f66add7f19..71d0fc6df7 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.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
index abd818fd3a..e1cf86cb2b 100644
--- 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
index f66add7f19..71d0fc6df7 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.17
+FROM alpine:3.18
 
 RUN     mkdir /cortex
 WORKDIR /cortex
diff --git a/packaging/fpm/Dockerfile b/packaging/fpm/Dockerfile
index 2796d540bf..e8cd025387 100644
--- 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 \