fix(build): Use Debian Bullseye base image for build image (#14368)

This change is necessary to allow the binaries built using the Loki build image to run on operating systems with older libc version. --- Backport of #14368 Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
grafana · Oct 3, 2024 · 00aaa94 · 00aaa94
1 parent 7184d45
commit 00aaa94
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 95 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -139,7 +139,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.33.5
+  image: grafana/loki-build-image:0.34.1
   name: documentation-helm-reference-check
 trigger:
   ref:
@@ -1085,7 +1085,7 @@ steps:
       from_secret: docker_password
     DOCKER_USERNAME:
       from_secret: docker_username
-  image: grafana/loki-build-image:0.33.5
+  image: grafana/loki-build-image:0.34.1
   name: build and push
   privileged: true
   volumes:
@@ -1308,6 +1308,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 8a2db8460244184bb92d99cfe9a366e0a1cce91034cfe3784436a2f178b976c7
+hmac: d4c58186c033c95f0a9072c2c677c3d1d6f5a137bc55718eb16815e32b856c05
 
 ...
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -2,7 +2,7 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/check.yml@main"
     "with":
-      "build_image": "grafana/loki-build-image:0.33.5"
+      "build_image": "grafana/loki-build-image:0.34.1"
       "golang_ci_lint_version": "v1.55.1"
       "release_lib_ref": "main"
       "skip_validation": false
@@ -12,4 +12,4 @@
   "pull_request": {}
   "push":
     "branches":
-    - "main"
+    - "main"
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
-      build_image: "grafana/loki-build-image:0.33.5"
+      build_image: "grafana/loki-build-image:0.34.1"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
       skip_validation: false
@@ -143,7 +143,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.33.5"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.34.1"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages
@@ -828,4 +828,4 @@ name: "Prepare Minor Release PR from Weekly"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/check.yml@main"
     with:
-      build_image: "grafana/loki-build-image:0.33.5"
+      build_image: "grafana/loki-build-image:0.34.1"
       golang_ci_lint_version: "v1.55.1"
       release_lib_ref: "main"
       skip_validation: false
@@ -143,7 +143,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.33.5"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.34.1"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages
@@ -828,4 +828,4 @@ name: "Prepare Patch Release PR"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -219,4 +219,4 @@ name: "create release"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/Makefile b/Makefile
@@ -37,7 +37,8 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
 BUILD_IN_CONTAINER ?= true
 
 # ensure you run `make drone` and `make release-workflows` after changing this
-BUILD_IMAGE_VERSION ?= 0.33.5
+BUILD_IMAGE_VERSION ?= 0.34.1
+GO_VERSION := 1.22.5
 
 # Docker image info
 IMAGE_PREFIX ?= grafana
@@ -663,7 +664,7 @@ else
 endif
 
 build-image: ensure-buildx-builder
-	$(SUDO) $(BUILD_OCI) -t $(IMAGE_PREFIX)/loki-build-image:$(IMAGE_TAG) ./loki-build-image
+	$(SUDO) $(BUILD_OCI) --build-arg=GO_VERSION=$(GO_VERSION) -t $(IMAGE_PREFIX)/loki-build-image:$(BUILD_IMAGE_VERSION) ./loki-build-image
 build-image-push: build-image ## push the docker build image
 ifneq (,$(findstring WIP,$(IMAGE_TAG)))
 	@echo "Cannot push a WIP image, commit changes first"; \

diff --git a/docs/sources/community/maintaining/release-loki-build-image.md b/docs/sources/community/maintaining/release-loki-build-image.md
@@ -14,23 +14,11 @@ if any changes were made in the folder `./loki-build-image/`.
 
 **To build and use the `loki-build-image`:**
 
-## Step 1
-
-1. Create a branch with the desired changes to the Dockerfile.
-2. Update the version tag of the `loki-build-image` pipeline defined in `.drone/drone.jsonnet` (search for `pipeline('loki-build-image')`) to a new version number (try to follow semver).
-3. Run `DRONE_SERVER=https://drone.grafana.net/ DRONE_TOKEN=<token> make drone` and commit the changes to the same branch.
-   1. The `<token>` is your personal drone token, which can be found by navigating to https://drone.grafana.net/account.
-4. Create a PR.
-5. Once approved and merged to `main`, the image with the new version is built and published.
-   {{% admonition type="note" %}}
-   Keep an eye on https://drone.grafana.net/grafana/loki for the build after merging ([example](https://drone.grafana.net/grafana/loki/17760/1/2)).
-   {{% /admonition %}}
-
-## Step 2
-
-1. Create a branch.
-2. Update the `BUILD_IMAGE_VERSION` variable in the `Makefile`.
-3. Run `loki-build-image/version-updater.sh <new-version>` to update all the references.
-4. Run `DRONE_SERVER=https://drone.grafana.net/ DRONE_TOKEN=<token> make drone` to update the Drone config to use the new build image.
-5. Create a new PR.
-
+1. Create a branch with the desired changes to the `./loki-build-image/Dockerfile`.
+1. Update the `BUILD_IMAGE_VERSION` variable in the `Makefile`.
+1. Commit your changes.
+1. Run `make build-image-push` to build and publish the new version of the build image.
+1. Run `make release-workflows` to update the Github workflows.
+1. Commit your changes.
+1. Push your changes to the remote branch.
+1. Open a PR against the `main` branch.
diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile
@@ -5,8 +5,11 @@
 # See ../docs/sources/community/maintaining/release-loki-build-image.md for instructions
 # on how to publish a new build image.
 
+ARG GO_VERSION=1.22.5
+ARG GOLANG_BASE_IMAGE=golang:${GO_VERSION}-bullseye
+
 # Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference.
-FROM golang:1.22.5-bookworm as helm
+FROM ${GOLANG_BASE_IMAGE} 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 && \
@@ -38,7 +41,8 @@ RUN apk add --no-cache curl && \
 FROM alpine:3.20.2 as docker
 RUN apk add --no-cache docker-cli docker-cli-buildx
 
-FROM golang:1.22.5-bookworm as drone
+
+FROM ${GOLANG_BASE_IMAGE} 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 +52,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.22.5-bookworm as faillint
+FROM ${GOLANG_BASE_IMAGE} AS faillint
 RUN GO111MODULE=on go install github.com/fatih/faillint@v1.12.0
 RUN GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.7.0
 
-FROM golang:1.22.5-bookworm as delve
+FROM ${GOLANG_BASE_IMAGE} 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.22.5-bookworm as ghr
+FROM ${GOLANG_BASE_IMAGE} 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.22.5-bookworm as nfpm
+FROM ${GOLANG_BASE_IMAGE} AS nfpm
 RUN GO111MODULE=on go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.11.3
 
 # Install gotestsum
-FROM golang:1.22.5-bookworm as gotestsum
+FROM ${GOLANG_BASE_IMAGE} AS gotestsum
 RUN GO111MODULE=on go install gotest.tools/gotestsum@v1.8.2
 
 # Install tools used to compile jsonnet.
-FROM golang:1.22.5-bookworm as jsonnet
+FROM ${GOLANG_BASE_IMAGE} AS jsonnet
 RUN GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1
 RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@16dc166166d91e93475b86b9355a4faed2400c18
 RUN GO111MODULE=on go install github.com/google/go-jsonnet/cmd/jsonnet@v0.20.0
 
 FROM aquasec/trivy as trivy
 
-FROM golang:1.22.5-bookworm
+FROM ${GOLANG_BASE_IMAGE}
 RUN apt-get update && \
     apt-get install -qy \
     musl gnupg ragel \

diff --git a/pkg/querier/queryrange/queryrangebase/queryrange.pb.go b/pkg/querier/queryrange/queryrangebase/queryrange.pb.go
diff --git a/pkg/querier/stats/stats.pb.go b/pkg/querier/stats/stats.pb.go
diff --git a/pkg/ruler/base/ruler.pb.go b/pkg/ruler/base/ruler.pb.go
diff --git a/pkg/ruler/rulespb/rules.pb.go b/pkg/ruler/rulespb/rules.pb.go