From 7603e77f53b02495faff46e185678e08513e8d8b 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 | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb1fcf81..c40cb715 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.25.6 -ARG DEBIAN_VERSION=bookworm +ARG DEBIAN_VERSION=trixie ARG XX_VERSION=1.7.0 ARG OSXCROSS_VERSION=11.3-r8-debian @@ -54,7 +54,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 \ @@ -62,7 +62,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 605fb926..29847009 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -1,10 +1,12 @@ # syntax=docker/dockerfile:1 ARG GO_VERSION=1.25.6 +ARG DEBIAN_VERSION=trixie + ARG DISTRO=ubuntu ARG SUITE=jammy -FROM golang:${GO_VERSION}-bookworm AS golang +FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS golang FROM ${DISTRO}:${SUITE} RUN apt-get update && apt-get install -yy debhelper dh-make libsecret-1-dev From 1d6c333e4f7d654a58a80f43d54e654cf55fa24e 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 29847009..a6f2b78b 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -4,7 +4,7 @@ ARG GO_VERSION=1.25.6 ARG DEBIAN_VERSION=trixie ARG DISTRO=ubuntu -ARG SUITE=jammy +ARG SUITE=noble FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS golang