Skip to content

Commit 272ebde

Browse files
Update build image to go 1 20 1 and alpine 3 16 4 (#8575)
Signed-off-by: Michel Hollands <[email protected]> Signed-off-by: Christian Haudum <[email protected]> Co-authored-by: Christian Haudum <[email protected]>
1 parent a013e9f commit 272ebde

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.drone/drone.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
446446

447447
[
448448
pipeline('loki-build-image') {
449-
local build_image_tag = '0.27.1',
449+
local build_image_tag = '0.28.0',
450450
workspace: {
451451
base: '/src',
452452
path: 'loki',

.drone/drone.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
dry_run: true
1111
repo: grafana/loki-build-image
1212
tags:
13-
- 0.27.1
13+
- 0.28.0
1414
when:
1515
event:
1616
- pull_request
@@ -26,7 +26,7 @@ steps:
2626
from_secret: docker_password
2727
repo: grafana/loki-build-image
2828
tags:
29-
- 0.27.1
29+
- 0.28.0
3030
username:
3131
from_secret: docker_username
3232
when:
@@ -1675,6 +1675,6 @@ kind: secret
16751675
name: gpg_private_key
16761676
---
16771677
kind: signature
1678-
hmac: c1930caa8e7ffedf82b641cc1204d87319cddf576efa787d2ef1a86d16c2b9cf
1678+
hmac: de9f4851c4bfd1324e22a0cb983432801b59240128c1b162ea67c5cd814606c9
16791679

16801680
...

loki-build-image/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,40 @@
55
# See ../docs/sources/maintaining/release-loki-build-image.md
66

77
# Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference.
8-
FROM golang:1.19.5 as helm
8+
FROM golang:1.20.1 as helm
99
ARG HELM_VER="v3.2.3"
1010
RUN curl -L -o /tmp/helm-$HELM_VER.tgz https://get.helm.sh/helm-${HELM_VER}-linux-amd64.tar.gz && \
1111
tar -xz -C /tmp -f /tmp/helm-$HELM_VER.tgz && \
1212
mv /tmp/linux-amd64/helm /usr/bin/helm && \
1313
rm -rf /tmp/linux-amd64 /tmp/helm-$HELM_VER.tgz
1414
RUN GO111MODULE=on go install github.com/norwoodj/helm-docs/cmd/[email protected]
1515

16-
FROM alpine:3.16.2 as lychee
16+
FROM alpine:3.16.4 as lychee
1717
ARG LYCHEE_VER="0.7.0"
1818
RUN apk add --no-cache curl && \
1919
curl -L -o /tmp/lychee-$LYCHEE_VER.tgz https://github.com/lycheeverse/lychee/releases/download/${LYCHEE_VER}/lychee-${LYCHEE_VER}-x86_64-unknown-linux-gnu.tar.gz && \
2020
tar -xz -C /tmp -f /tmp/lychee-$LYCHEE_VER.tgz && \
2121
mv /tmp/lychee /usr/bin/lychee && \
2222
rm -rf /tmp/linux-amd64 /tmp/lychee-$LYCHEE_VER.tgz
2323

24-
FROM alpine:3.16.2 as golangci
24+
FROM alpine:3.16.4 as golangci
2525
RUN apk add --no-cache curl && \
2626
cd / && \
2727
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.0
2828

29-
FROM alpine:3.16.2 as buf
29+
FROM alpine:3.16.4 as buf
3030

3131
RUN apk add --no-cache curl && \
3232
curl -sSL "https://github.com/bufbuild/buf/releases/download/v1.4.0/buf-$(uname -s)-$(uname -m)" -o "/usr/bin/buf" && \
3333
chmod +x "/usr/bin/buf"
3434

35-
FROM alpine:3.16.2 as docker
35+
FROM alpine:3.16.4 as docker
3636
RUN apk add --no-cache docker-cli
3737

3838
# TODO this should be fixed to download and extract the specific release binary from github as we do for golangci and helm above
3939
# however we need a commit which hasn't been released yet: https://github.com/drone/drone-cli/commit/1fad337d74ca0ecf420993d9d2d7229a1c99f054
4040
# Read the comment below regarding GO111MODULE=on and why it is necessary
41-
FROM golang:1.19.5 as drone
41+
FROM golang:1.20.1 as drone
4242
RUN curl -L https://github.com/drone/drone-cli/releases/download/v1.4.0/drone_linux_amd64.tar.gz | tar zx && \
4343
install -t /usr/local/bin drone
4444

@@ -47,32 +47,32 @@ RUN curl -L https://github.com/drone/drone-cli/releases/download/v1.4.0/drone_li
4747
# Error:
4848
# github.com/fatih/[email protected] requires golang.org/x/[email protected]
4949
# (not golang.org/x/[email protected] from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
50-
FROM golang:1.19.5 as faillint
50+
FROM golang:1.20.1 as faillint
5151
RUN GO111MODULE=on go install github.com/fatih/[email protected]
5252

53-
FROM golang:1.19.5 as delve
53+
FROM golang:1.20.1 as delve
5454
RUN GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest
5555

5656
# Install ghr used to push binaries and template the release
5757
# 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.
58-
FROM golang:1.19.5 as ghr
58+
FROM golang:1.20.1 as ghr
5959
RUN GO111MODULE=on go install github.com/tcnksm/ghr@9349474
6060

6161
# Install nfpm (https://nfpm.goreleaser.com) for creating .deb and .rpm packages.
62-
FROM golang:1.19.5 as nfpm
62+
FROM golang:1.20.1 as nfpm
6363
RUN GO111MODULE=on go install github.com/goreleaser/nfpm/v2/cmd/[email protected]
6464

6565
# Install gotestsum
66-
FROM golang:1.19.5 as gotestsum
66+
FROM golang:1.20.1 as gotestsum
6767
RUN GO111MODULE=on go install gotest.tools/[email protected]
6868

6969
# Install tools used to compile jsonnet.
70-
FROM golang:1.19.5 as jsonnet
70+
FROM golang:1.20.1 as jsonnet
7171
RUN GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
7272
RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066
7373
RUN GO111MODULE=on go install github.com/google/go-jsonnet/cmd/[email protected]
7474

75-
FROM golang:1.19.5-buster
75+
FROM golang:1.20.1-buster
7676
RUN apt-get update && \
7777
apt-get install -qy \
7878
musl gnupg ragel \

0 commit comments

Comments
 (0)