From ce41c99a00a6c68cf0f269170c2736250e8c0a6d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 8 Jan 2026 12:45:12 +0100 Subject: [PATCH 1/2] Dockerfile: update to debian trixie, libgcc-12-dev Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 6 +++--- deb/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d24b9c4d..fddff7b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG GO_VERSION=1.26.3 # BASE_DEBIAN_DISTRO sets the golang base image debian variant to use. # It must be a valid variant in the docker.io/library/golang image repository. -ARG BASE_DEBIAN_DISTRO=bookworm +ARG BASE_DEBIAN_DISTRO=trixie # XX_VERSION sets the version of the xx utility to use. # It must be a valid tag in the docker.io/tonistiigi/xx image repository. @@ -70,7 +70,7 @@ EOT FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS golangci-lint FROM gobase AS lint -RUN apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config +RUN apt-get install -y binutils gcc libc6-dev libgcc-12-dev libsecret-1-dev pkg-config RUN --mount=type=bind,target=. \ --mount=type=cache,target=/root/.cache \ --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \ @@ -78,7 +78,7 @@ RUN --mount=type=bind,target=. \ FROM gobase AS base ARG TARGETPLATFORM -RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config +RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-12-dev libsecret-1-dev pkg-config FROM base AS test RUN xx-apt-get install -y dbus-x11 gnome-keyring gpg-agent gpgconf libsecret-1-dev pass diff --git a/deb/Dockerfile b/deb/Dockerfile index bd817762..84c78a10 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -6,7 +6,7 @@ ARG GO_VERSION=1.26.3 # BASE_DEBIAN_DISTRO sets the golang base image debian variant to use. # It must be a valid variant in the docker.io/library/golang image repository. -ARG BASE_DEBIAN_DISTRO=bookworm +ARG BASE_DEBIAN_DISTRO=trixie ARG DISTRO=ubuntu ARG SUITE=jammy From e65dd7fb47e0c6f9d56fb219a3add04d213991fb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 8 Jan 2026 13:07:51 +0100 Subject: [PATCH 2/2] deb: Dockerfile: use ubuntu 24.04 (noble) Signed-off-by: Sebastiaan van Stijn --- deb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/Dockerfile b/deb/Dockerfile index 84c78a10..480d4168 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -9,7 +9,7 @@ ARG GO_VERSION=1.26.3 ARG BASE_DEBIAN_DISTRO=trixie ARG DISTRO=ubuntu -ARG SUITE=jammy +ARG SUITE=noble FROM golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO} AS gobase