Skip to content

Commit c6cabb2

Browse files
committed
Dockerfile: update to debian trixie, libgcc-12-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent ecf6c1c commit c6cabb2

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.25.5
4-
ARG DEBIAN_VERSION=bookworm
4+
ARG DEBIAN_VERSION=trixie
55

66
ARG XX_VERSION=1.7.0
77
ARG OSXCROSS_VERSION=11.3-r8-debian
@@ -57,7 +57,7 @@ EOT
5757
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS golangci-lint
5858
FROM gobase AS lint
5959
ARG DEBIAN_FRONTEND
60-
RUN apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config
60+
RUN apt-get install -y binutils gcc libc6-dev libgcc-12-dev libsecret-1-dev pkg-config
6161
RUN --mount=type=bind,target=. \
6262
--mount=type=cache,target=/root/.cache \
6363
--mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
@@ -66,7 +66,7 @@ RUN --mount=type=bind,target=. \
6666
FROM gobase AS base
6767
ARG TARGETPLATFORM
6868
ARG DEBIAN_FRONTEND
69-
RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config
69+
RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-12-dev libsecret-1-dev pkg-config
7070

7171
FROM base AS test
7272
ARG DEBIAN_FRONTEND

deb/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.25.5
4+
ARG DEBIAN_VERSION=trixie
5+
46
ARG DISTRO=ubuntu
57
ARG SUITE=jammy
68

7-
FROM golang:${GO_VERSION}-bookworm AS golang
9+
FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS golang
810

911
FROM ${DISTRO}:${SUITE}
1012

0 commit comments

Comments
 (0)