From 3b792412393f242fd5221147a541fd0d8de7f524 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Sat, 20 Jan 2024 00:40:11 +0100 Subject: [PATCH] Packaging: Re-add compatibility with glibc 2.31 ... by building on `golang:1.20-bullseye`. --- CHANGES.rst | 4 ++++ Dockerfile | 2 +- devtools/release.Dockerfile | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d02f742..d5fa3b4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,10 @@ CHANGES for CrateDB Prometheus Adapter Unreleased ========== +- Packaging: Re-add compatibility with glibc 2.31, + by building on ``golang:1.20-bullseye``. + + 2024-01-12 0.5.0 ================ diff --git a/Dockerfile b/Dockerfile index 0a1cf03..b5e9b3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 as builder +FROM golang:1.20-bullseye as builder WORKDIR /go/src/github.com/crate/cratedb-prometheus-adapter COPY . /go/src/github.com/crate/cratedb-prometheus-adapter/ RUN CGO_ENABLED=0 GOOS=linux go build diff --git a/devtools/release.Dockerfile b/devtools/release.Dockerfile index 04ad4a4..e2c6190 100644 --- a/devtools/release.Dockerfile +++ b/devtools/release.Dockerfile @@ -3,7 +3,7 @@ # Run release archive builder within Docker container. # -FROM golang:1.21 +FROM golang:1.20-bullseye RUN apt-get update && apt-get --yes install zip