Revert "ci: create build image version with go 1.21.9 and golangci 1.…

…51.2 (#1…"

This reverts commit 57ae4ab.

.drone/drone.jsonnet

@@ -400,7 +400,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: {

.drone/drone.yml

@@ -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:
@@ -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:
@@ -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:
@@ -1362,6 +1362,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 560c2d3971da2fd49144c9ff81048607e4caaa11efab55be5e112c971239d1b1
+hmac: a86ee316be8eac6e8af4f33b2dbf469ef8e16f2aa4912d1124cfed3ecd30f449
 
 ...

loki-build-image/Dockerfile

@@ -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

loki-build-image/README.md

@@ -2,12 +2,6 @@
 
 ## Versions
 
-### 0.33.1-golangci.1.51.2
-
-- Update to Go version 1.21.9 but restore golangci-lint to v1.51.2
-
-* This release should only be used for the release branches such as 2.9.x and 2.8.x. *
-
 ### 0.33.1
 
 - Update to Go 1.21.9
@@ -31,7 +25,7 @@
 
 * This release should only be used for the release branches such as 2.8.x and 2.7.x. *
 The current release of the build image uses golangci-lint to v1.53.2 which makes
-a lot of linter checks mandatory requiring a huge amount of fixes.
+a lot of linter checks mandatory causing a huge amount of fixes 
 See https://github.com/grafana/loki/pull/9601. To avoid the integration problems this
 build image will be used in those branches.