Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## master / unreleased

* [ENHANCEMENT] Upgraded Docker base images to `alpine:3.14`. #4514

## 1.11.0-rc.0 in progress

Expand Down
2 changes: 1 addition & 1 deletion cmd/blocksconvert/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14
RUN apk add --no-cache ca-certificates
COPY blocksconvert /
ENTRYPOINT ["/blocksconvert"]
Expand Down
2 changes: 1 addition & 1 deletion cmd/cortex/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14
RUN apk add --no-cache ca-certificates
COPY migrations /migrations/
COPY cortex /bin/cortex
Expand Down
2 changes: 1 addition & 1 deletion cmd/query-tee/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14
RUN apk add --no-cache ca-certificates
COPY query-tee /
ENTRYPOINT ["/query-tee"]
Expand Down
2 changes: 1 addition & 1 deletion cmd/test-exporter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14
RUN apk add --no-cache ca-certificates
COPY test-exporter /
ENTRYPOINT ["/test-exporter"]
Expand Down
2 changes: 1 addition & 1 deletion cmd/thanosconvert/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14
RUN apk add --no-cache ca-certificates
COPY thanosconvert /
ENTRYPOINT ["/thanosconvert"]
Expand Down
2 changes: 1 addition & 1 deletion development/tsdb-blocks-storage-s3-gossip/dev.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.16
ENV CGO_ENABLED=0
RUN go get github.com/go-delve/delve/cmd/dlv

FROM alpine:3.13
FROM alpine:3.14

RUN mkdir /cortex
WORKDIR /cortex
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14

RUN mkdir /cortex
WORKDIR /cortex
Expand Down
2 changes: 1 addition & 1 deletion development/tsdb-blocks-storage-s3/dev.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.16
ENV CGO_ENABLED=0
RUN go get github.com/go-delve/delve/cmd/dlv

FROM alpine:3.13
FROM alpine:3.14

RUN mkdir /cortex
WORKDIR /cortex
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14

RUN mkdir /cortex
WORKDIR /cortex
Expand Down