Skip to content

Commit 04b7a5a

Browse files
authored
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]>
1 parent 5a60142 commit 04b7a5a

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## v2.5.0-rc.1
44

5+
* [CHANGE] Update Alpine image version to 3.20 [#3710](https://github.com/grafana/tempo/pull/3710) (@joe-elliott)
56
* [ENHANCEMENT] TraceQL - Add support for trace:id and span:id [#3670](https://github.com/grafana/tempo/pull/3670) (@ie-pham)
67
* [BUGFIX] Fix TraceQL queries involving non boolean operations between statics and attributes. [#3698](https://github.com/grafana/tempo/pull/3698) (@joe-elliott)
78

cmd/tempo-cli/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19 as certs
1+
FROM alpine:3.20 as certs
22
RUN apk --update add ca-certificates
33
ARG TARGETARCH
44
COPY bin/linux/tempo-cli-${TARGETARCH} /tempo-cli

cmd/tempo-serverless/cloud-run/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# build the serverless container image
1010
#
1111
# todo: FROM scratch saves ~5MB which could be meaningful in a serverless setting, but using scratch gave strange errors on query.
12-
FROM alpine:3.19 as certs
12+
FROM alpine:3.20 as certs
1313
RUN apk --update add ca-certificates
1414
COPY ./main /main
1515
ENTRYPOINT ["/main"]

cmd/tempo-vulture/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19 as certs
1+
FROM alpine:3.20 as certs
22
RUN apk --update add ca-certificates
33
ARG TARGETARCH
44
COPY bin/linux/tempo-vulture-${TARGETARCH} /tempo-vulture

cmd/tempo/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19 as certs
1+
FROM alpine:3.20 as certs
22
RUN apk --update add ca-certificates
33
ARG TARGETARCH
44
COPY bin/linux/tempo-${TARGETARCH} /tempo

cmd/tempo/Dockerfile_debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:alpine AS build-dlv
22

33
RUN go install github.com/go-delve/delve/cmd/dlv@latest
44

5-
FROM alpine:3.19 as certs
5+
FROM alpine:3.20 as certs
66
RUN apk --update add ca-certificates bash
77
ARG TARGETARCH
88
COPY bin/linux/tempo-${TARGETARCH} /tempo

0 commit comments

Comments
 (0)