Skip to content

Commit

Permalink
fix: Revert Golang base image to Debian Bullseye
Browse files Browse the repository at this point in the history
This fixes the glibc version issue in Promtail with older OS versions.

Signed-off-by: Christian Haudum <[email protected]>
  • Loading branch information
chaudum committed Oct 4, 2024
1 parent 1ee2872 commit a3ed3e7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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.6
BUILD_IMAGE_VERSION ?= 0.33.7
GO_VERSION := 1.22.6

# Docker image info
Expand Down
20 changes: 10 additions & 10 deletions loki-build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# tag of the Docker image in `../.drone/drone.jsonnet` and run `make drone`.
# 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
ARG GO_VERSION=1.22.6
# Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference.
FROM golang:${GO_VERSION}-bookworm AS helm
FROM golang:${GO_VERSION}-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 && \
Expand Down Expand Up @@ -38,7 +38,7 @@ 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:${GO_VERSION}-bookworm AS drone
FROM golang:${GO_VERSION}-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
Expand All @@ -48,35 +48,35 @@ RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_l
# Error:
# github.com/fatih/[email protected] requires golang.org/x/[email protected]
# (not golang.org/x/[email protected] from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
FROM golang:${GO_VERSION}-bookworm AS faillint
FROM golang:${GO_VERSION}-bullseye AS faillint
RUN GO111MODULE=on go install github.com/fatih/[email protected]
RUN GO111MODULE=on go install golang.org/x/tools/cmd/[email protected]

FROM golang:${GO_VERSION}-bookworm AS delve
FROM golang:${GO_VERSION}-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:${GO_VERSION}-bookworm AS ghr
FROM golang:${GO_VERSION}-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:${GO_VERSION}-bookworm AS nfpm
FROM golang:${GO_VERSION}-bullseye AS nfpm
RUN GO111MODULE=on go install github.com/goreleaser/nfpm/v2/cmd/[email protected]

# Install gotestsum
FROM golang:${GO_VERSION}-bookworm AS gotestsum
FROM golang:${GO_VERSION}-bullseye AS gotestsum
RUN GO111MODULE=on go install gotest.tools/[email protected]

# Install tools used to compile jsonnet.
FROM golang:${GO_VERSION}-bookworm AS jsonnet
FROM golang:${GO_VERSION}-bullseye AS jsonnet
RUN GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@16dc166166d91e93475b86b9355a4faed2400c18
RUN GO111MODULE=on go install github.com/google/go-jsonnet/cmd/[email protected]

FROM aquasec/trivy AS trivy

FROM golang:${GO_VERSION}-bookworm
FROM golang:${GO_VERSION}-bullseye
RUN apt-get update && \
apt-get install -qy \
musl gnupg ragel \
Expand Down
4 changes: 4 additions & 0 deletions loki-build-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Versions

### 0.33.7

- Revert Golang base image to Debian Bullseye

### 0.33.6

- Update to go 1.22.6
Expand Down

0 comments on commit a3ed3e7

Please sign in to comment.