Skip to content

Commit 58c87f0

Browse files
authored
Merge pull request #341 from crazy-max/update-debian
dockerfile: update debian to bookworm
2 parents 6e5b45e + dbb72e3 commit 58c87f0

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Dockerfile

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

33
ARG GO_VERSION=1.21.10
4+
ARG DEBIAN_VERSION=bookworm
5+
46
ARG XX_VERSION=1.4.0
57
ARG OSXCROSS_VERSION=11.3-r7-debian
68
ARG GOLANGCI_LINT_VERSION=v1.55.2
@@ -14,7 +16,7 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
1416
# osxcross contains the MacOSX cross toolchain for xx
1517
FROM crazymax/osxcross:${OSXCROSS_VERSION} AS osxcross
1618

17-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS gobase
19+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${DEBIAN_VERSION} AS gobase
1820
COPY --from=xx / /
1921
ARG DEBIAN_FRONTEND
2022
RUN apt-get update && apt-get install -y --no-install-recommends clang dpkg-dev file git lld llvm make pkg-config rsync
@@ -55,7 +57,7 @@ EOT
5557
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS golangci-lint
5658
FROM gobase AS lint
5759
ARG DEBIAN_FRONTEND
58-
RUN apt-get install -y binutils gcc libc6-dev libgcc-10-dev libsecret-1-dev pkg-config
60+
RUN apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config
5961
RUN --mount=type=bind,target=. \
6062
--mount=type=cache,target=/root/.cache \
6163
--mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
@@ -64,7 +66,7 @@ RUN --mount=type=bind,target=. \
6466
FROM gobase AS base
6567
ARG TARGETPLATFORM
6668
ARG DEBIAN_FRONTEND
67-
RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-10-dev libsecret-1-dev pkg-config
69+
RUN xx-apt-get install -y binutils gcc libc6-dev libgcc-11-dev libsecret-1-dev pkg-config
6870

6971
FROM base AS test
7072
ARG DEBIAN_FRONTEND

0 commit comments

Comments
 (0)