diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet index 9d0589fe22a8..22aea6efb9f9 100644 --- a/.drone/drone.jsonnet +++ b/.drone/drone.jsonnet @@ -400,7 +400,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') { ], }; -local build_image_tag = '0.33.0'; +local build_image_tag = '0.33.1'; [ pipeline('loki-build-image-' + arch) { workspace: { diff --git a/.drone/drone.yml b/.drone/drone.yml index ccac7a2c6ce5..100ee94fc58b 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -17,7 +17,7 @@ steps: from_secret: docker_password repo: grafana/loki-build-image tags: - - 0.33.0-amd64 + - 0.33.1-amd64 username: from_secret: docker_username when: @@ -54,7 +54,7 @@ steps: from_secret: docker_password repo: grafana/loki-build-image tags: - - 0.33.0-arm64 + - 0.33.1-arm64 username: from_secret: docker_username when: @@ -86,7 +86,7 @@ steps: password: from_secret: docker_password spec: .drone/docker-manifest-build-image.tmpl - target: loki-build-image:0.33.0 + target: loki-build-image:0.33.1 username: from_secret: docker_username when: @@ -1362,6 +1362,6 @@ kind: secret name: gpg_private_key --- kind: signature -hmac: 32b44aecaad0258ed9494225595e1016a56bea960bcd0b15b2db3449bed957e0 +hmac: 452ccacf982174ae96c64fc2d0868859d26dbf6944e49d9170d780ff40a81eb8 ... diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile index a0263270f66f..097bdd205fe7 100644 --- a/loki-build-image/Dockerfile +++ b/loki-build-image/Dockerfile @@ -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/faillint@v1.5.0 requires golang.org/x/tools@v0.0.0-20200207224406-61798d64f025 # (not golang.org/x/tools@v0.0.0-20190918214920-58d531046acd 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/faillint@v1.11.0 RUN GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.7.0 -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/nfpm@v2.11.3 # 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/gotestsum@v1.8.2 # 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/jb@v0.4.0 RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 RUN GO111MODULE=on go install github.com/google/go-jsonnet/cmd/jsonnet@v0.18.0 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 \