-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: bump go and alpine version in build image (#12465)
Signed-off-by: Michel Hollands <[email protected]>
- Loading branch information
1 parent
a6f3b93
commit 920facc
Showing
3 changed files
with
19 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,11 +2,11 @@ | |
# pipelines. | ||
# If you make changes to this Dockerfile you also need to update the | ||
# tag of the Docker image in `../.drone/drone.jsonnet` and run `make drone`. | ||
# See ../docs/sources/maintaining/release-loki-build-image.md for instructions | ||
# See ../docs/sources/community/maintaining/release-loki-build-image.md for instructions | ||
# on how to publish a new build image. | ||
|
||
# Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference. | ||
FROM golang:1.21.3-bullseye as helm | ||
FROM golang:1.21.9-bullseye as helm | ||
ARG TARGETARCH | ||
ARG HELM_VER="v3.2.3" | ||
RUN curl -L "https://get.helm.sh/helm-${HELM_VER}-linux-$TARGETARCH.tar.gz" | tar zx && \ | ||
|
@@ -15,7 +15,7 @@ RUN BIN=$([ "$TARGETARCH" = "arm64" ] && echo "helm-docs_Linux_arm64" || echo "h | |
curl -L "https://github.com/norwoodj/helm-docs/releases/download/v1.11.2/$BIN.tar.gz" | tar zx && \ | ||
install -t /usr/local/bin helm-docs | ||
|
||
FROM alpine:3.18.5 as lychee | ||
FROM alpine:3.18.6 as lychee | ||
ARG TARGETARCH | ||
ARG LYCHEE_VER="0.7.0" | ||
RUN apk add --no-cache curl && \ | ||
|
@@ -24,21 +24,21 @@ RUN apk add --no-cache curl && \ | |
mv /tmp/lychee /usr/bin/lychee && \ | ||
rm -rf "/tmp/linux-$TARGETARCH" /tmp/lychee-$LYCHEE_VER.tgz | ||
|
||
FROM alpine:3.18.5 as golangci | ||
FROM alpine:3.18.6 as golangci | ||
RUN apk add --no-cache curl && \ | ||
cd / && \ | ||
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.1 | ||
|
||
FROM alpine:3.18.5 as buf | ||
FROM alpine:3.18.6 as buf | ||
ARG TARGETOS | ||
RUN apk add --no-cache curl && \ | ||
curl -sSL "https://github.com/bufbuild/buf/releases/download/v1.4.0/buf-$TARGETOS-$(uname -m)" -o "/usr/bin/buf" && \ | ||
chmod +x "/usr/bin/buf" | ||
|
||
FROM alpine:3.18.5 as docker | ||
FROM alpine:3.18.6 as docker | ||
RUN apk add --no-cache docker-cli docker-cli-buildx | ||
|
||
FROM golang:1.21.3-bullseye as drone | ||
FROM golang:1.21.9-bullseye as drone | ||
ARG TARGETARCH | ||
RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_linux_$TARGETARCH".tar.gz | tar zx && \ | ||
install -t /usr/local/bin drone | ||
|
@@ -48,35 +48,35 @@ RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_l | |
# Error: | ||
# github.com/fatih/[email protected] requires golang.org/x/[email protected] | ||
# (not golang.org/x/[email protected] from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69) | ||
FROM golang:1.21.3-bullseye as faillint | ||
FROM golang:1.21.9-bullseye as faillint | ||
RUN GO111MODULE=on go install github.com/fatih/[email protected] | ||
RUN GO111MODULE=on go install golang.org/x/tools/cmd/[email protected] | ||
|
||
FROM golang:1.21.3-bullseye as delve | ||
FROM golang:1.21.9-bullseye as delve | ||
RUN GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest | ||
|
||
# Install ghr used to push binaries and template the release | ||
# This collides with the version of go tools used in the base image, thus we install it in its own image and copy it over. | ||
FROM golang:1.21.3-bullseye as ghr | ||
FROM golang:1.21.9-bullseye as ghr | ||
RUN GO111MODULE=on go install github.com/tcnksm/ghr@9349474 | ||
|
||
# Install nfpm (https://nfpm.goreleaser.com) for creating .deb and .rpm packages. | ||
FROM golang:1.21.3-bullseye as nfpm | ||
FROM golang:1.21.9-bullseye as nfpm | ||
RUN GO111MODULE=on go install github.com/goreleaser/nfpm/v2/cmd/[email protected] | ||
|
||
# Install gotestsum | ||
FROM golang:1.21.3-bullseye as gotestsum | ||
FROM golang:1.21.9-bullseye as gotestsum | ||
RUN GO111MODULE=on go install gotest.tools/[email protected] | ||
|
||
# Install tools used to compile jsonnet. | ||
FROM golang:1.21.3-bullseye as jsonnet | ||
FROM golang:1.21.9-bullseye as jsonnet | ||
RUN GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected] | ||
RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 | ||
RUN GO111MODULE=on go install github.com/google/go-jsonnet/cmd/[email protected] | ||
|
||
FROM aquasec/trivy as trivy | ||
|
||
FROM golang:1.21.3-bullseye | ||
FROM golang:1.21.9-bullseye | ||
RUN apt-get update && \ | ||
apt-get install -qy \ | ||
musl gnupg ragel \ | ||
|