Skip to content

Commit 0dd7221

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

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
@@ -54,15 +54,15 @@ EOT
5454

5555
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS golangci-lint
5656
FROM gobase AS lint
57-
RUN apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config
57+
RUN apt-get install -y binutils gcc libc6-dev libgcc-12-dev libsecret-1-dev pkg-config
5858
RUN --mount=type=bind,target=. \
5959
--mount=type=cache,target=/root/.cache \
6060
--mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
6161
golangci-lint run ./...
6262

6363
FROM gobase AS base
6464
ARG TARGETPLATFORM
65-
RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config
65+
RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-12-dev libsecret-1-dev pkg-config
6666

6767
FROM base AS test
6868
RUN xx-apt-get install -y dbus-x11 gnome-keyring gpg-agent gpgconf libsecret-1-dev pass

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
RUN apt-get update && apt-get install -yy debhelper dh-make libsecret-1-dev

0 commit comments

Comments
 (0)