Skip to content

Commit

Permalink
[20.10] Dockerfile: switch to debian "bullseye"
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Jul 17, 2023
1 parent 4abd25e commit e3984f4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ ARG TARGETPLATFORM
# gcc is installed for libgcc only
RUN xx-apk add --no-cache musl-dev gcc

FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye
COPY --from=xx / /
RUN apt-get update && apt-get install --no-install-recommends -y clang lld file
WORKDIR /go/src/github.com/docker/cli

FROM build-base-buster AS build-buster
FROM build-base-bullseye AS build-bullseye
ARG TARGETPLATFORM
RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev

Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ target "binary" {
platforms = ["local"]
output = ["build"]
args = {
BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine"
BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION
GO_STRIP = STRIP_TARGET
}
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG GO_VERSION=1.19.10

# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster
FROM golang:${GO_VERSION}-bullseye

RUN apt-get update && apt-get install -y \
build-essential \
Expand Down

0 comments on commit e3984f4

Please sign in to comment.