Upgrade alpine to 3.20.x (#3710)

* upgrade alpine Signed-off-by: Joe Elliott <[email protected]> * changelog Signed-off-by: Joe Elliott <[email protected]> --------- Signed-off-by: Joe Elliott <[email protected]>
grafana · May 23, 2024 · 04b7a5a · 04b7a5a
1 parent 5a60142
commit 04b7a5a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## v2.5.0-rc.1
 
+* [CHANGE] Update Alpine image version to 3.20 [#3710](https://github.com/grafana/tempo/pull/3710) (@joe-elliott)
 * [ENHANCEMENT] TraceQL - Add support for trace:id and span:id [#3670](https://github.com/grafana/tempo/pull/3670) (@ie-pham)
 * [BUGFIX] Fix TraceQL queries involving non boolean operations between statics and attributes. [#3698](https://github.com/grafana/tempo/pull/3698) (@joe-elliott)
 

diff --git a/cmd/tempo-cli/Dockerfile b/cmd/tempo-cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19 as certs
+FROM alpine:3.20 as certs
 RUN apk --update add ca-certificates
 ARG TARGETARCH
 COPY bin/linux/tempo-cli-${TARGETARCH} /tempo-cli

diff --git a/cmd/tempo-serverless/cloud-run/Dockerfile b/cmd/tempo-serverless/cloud-run/Dockerfile
@@ -9,7 +9,7 @@
 # build the serverless container image
 #
 #  todo: FROM scratch saves ~5MB which could be meaningful in a serverless setting, but using scratch gave strange errors on query.
-FROM alpine:3.19 as certs
+FROM alpine:3.20 as certs
 RUN apk --update add ca-certificates
 COPY ./main /main
 ENTRYPOINT ["/main"]
diff --git a/cmd/tempo-vulture/Dockerfile b/cmd/tempo-vulture/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19 as certs
+FROM alpine:3.20 as certs
 RUN apk --update add ca-certificates
 ARG TARGETARCH
 COPY bin/linux/tempo-vulture-${TARGETARCH} /tempo-vulture

diff --git a/cmd/tempo/Dockerfile b/cmd/tempo/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19 as certs
+FROM alpine:3.20 as certs
 RUN apk --update add ca-certificates
 ARG TARGETARCH
 COPY bin/linux/tempo-${TARGETARCH} /tempo

diff --git a/cmd/tempo/Dockerfile_debug b/cmd/tempo/Dockerfile_debug
@@ -2,7 +2,7 @@ FROM golang:alpine AS build-dlv
 
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
-FROM alpine:3.19 as certs
+FROM alpine:3.20 as certs
 RUN apk --update add ca-certificates bash
 ARG TARGETARCH
 COPY bin/linux/tempo-${TARGETARCH} /tempo