Skip to content

Commit

Permalink
ci: Revert "ci: create build image version with go 1.21.9 and golangc…
Browse files Browse the repository at this point in the history
…i 1.51.2" (grafana#12485)

Signed-off-by: Michel Hollands <[email protected]>
  • Loading branch information
MichelHollands authored Apr 9, 2024
1 parent a0f1001 commit 35cabf3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
],
};

local build_image_tag = '0.33.1-golangci.1.51.2';
local build_image_tag = '0.33.1';
[
pipeline('loki-build-image-' + arch) {
workspace: {
Expand Down
8 changes: 4 additions & 4 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
from_secret: docker_password
repo: grafana/loki-build-image
tags:
- 0.33.1-golangci.1.51.2-amd64
- 0.33.1-amd64
username:
from_secret: docker_username
when:
Expand Down Expand Up @@ -54,7 +54,7 @@ steps:
from_secret: docker_password
repo: grafana/loki-build-image
tags:
- 0.33.1-golangci.1.51.2-arm64
- 0.33.1-arm64
username:
from_secret: docker_username
when:
Expand Down Expand Up @@ -86,7 +86,7 @@ steps:
password:
from_secret: docker_password
spec: .drone/docker-manifest-build-image.tmpl
target: loki-build-image:0.33.1-golangci.1.51.2
target: loki-build-image:0.33.1
username:
from_secret: docker_username
when:
Expand Down Expand Up @@ -1340,6 +1340,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: ef80f57ffff4f20ac7e12ef7eec7d8cee1d0b217a8ec5a93fe8d459f0967e155
hmac: dbc4d2b5c84e0464f24846abc8e7e73a5a937df289a0ecdb501f3bca28ebb8e3

...
2 changes: 1 addition & 1 deletion loki-build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apk add --no-cache curl && \
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.51.2
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.1

FROM alpine:3.18.6 as buf
ARG TARGETOS
Expand Down

0 comments on commit 35cabf3

Please sign in to comment.