Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3493 from thaJeztah/bump_to_bullseye 

Update to debian bullseye
This commit is contained in:
Sebastiaan van Stijn 2022-03-28 16:24:00 +02:00 committed by GitHub
parent 75c923a962 dce5929794
commit 5a1e151c02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
- connhelper-ssh - connhelper-ssh
base: base:
- alpine - alpine
- buster - bullseye
engine-version: engine-version:
# - 20.10-dind # FIXME: Fails on 20.10 # - 20.10-dind # FIXME: Fails on 20.10
- stable-dind # TODO: Use 20.10-dind, stable-dind is deprecated - stable-dind # TODO: Use 20.10-dind, stable-dind is deprecated

16
Dockerfile
View File

@ -19,14 +19,14 @@ ARG TARGETPLATFORM
# gcc is installed for libgcc only # gcc is installed for libgcc only
RUN xx-apk add --no-cache musl-dev gcc 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 / / COPY --from=xx / /
RUN apt-get update && apt-get install --no-install-recommends -y bash clang lld file RUN apt-get update && apt-get install --no-install-recommends -y bash clang lld file
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli
FROM build-base-buster AS build-buster FROM build-base-bullseye AS build-bullseye
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN xx-apt-get install --no-install-recommends -y libc6-dev libgcc-8-dev RUN xx-apt-get install --no-install-recommends -y libc6-dev libgcc-10-dev
FROM build-base-${BASE_VARIANT} AS goversioninfo FROM build-base-${BASE_VARIANT} AS goversioninfo
ARG GOVERSIONINFO_VERSION ARG GOVERSIONINFO_VERSION
@ -55,6 +55,8 @@ ARG VERSION
# PACKAGER_NAME sets the company that produced the windows binary # PACKAGER_NAME sets the company that produced the windows binary
ARG PACKAGER_NAME ARG PACKAGER_NAME
COPY --from=goversioninfo /out/goversioninfo /usr/bin/goversioninfo COPY --from=goversioninfo /out/goversioninfo /usr/bin/goversioninfo
# in bullseye arm64 target does not link with lld so configure it to use ld instead
RUN [ ! -f /etc/alpine-release ] && xx-info is-cross && [ "$(xx-info arch)" = "arm64" ] && XX_CC_PREFER_LINKER=ld xx-clang --setup-target-triple || true
RUN --mount=type=bind,target=.,ro \ RUN --mount=type=bind,target=.,ro \
--mount=type=cache,target=/root/.cache \ --mount=type=cache,target=/root/.cache \
--mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk \ --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk \
@ -69,9 +71,9 @@ FROM build-${BASE_VARIANT} AS test
COPY --from=gotestsum /out/gotestsum /usr/bin/gotestsum COPY --from=gotestsum /out/gotestsum /usr/bin/gotestsum
ENV GO111MODULE=auto ENV GO111MODULE=auto
RUN --mount=type=bind,target=.,rw \ RUN --mount=type=bind,target=.,rw \
--mount=type=cache,target=/root/.cache \ --mount=type=cache,target=/root/.cache \
--mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/go/pkg/mod \
gotestsum -- -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/') gotestsum -- -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/')
FROM scratch AS test-coverage FROM scratch AS test-coverage
COPY --from=test /tmp/coverage.txt /coverage.txt COPY --from=test /tmp/coverage.txt /coverage.txt
@ -90,7 +92,7 @@ RUN --mount=ro --mount=type=cache,target=/root/.cache \
FROM build-base-alpine AS e2e-base-alpine FROM build-base-alpine AS e2e-base-alpine
RUN apk add --no-cache build-base curl docker-compose openssl openssh-client RUN apk add --no-cache build-base curl docker-compose openssl openssh-client
FROM build-base-buster AS e2e-base-buster FROM build-base-bullseye AS e2e-base-bullseye
RUN apt-get update && apt-get install -y build-essential curl openssl openssh-client RUN apt-get update && apt-get install -y build-essential curl openssl openssh-client
ARG COMPOSE_VERSION=1.29.2 ARG COMPOSE_VERSION=1.29.2
RUN curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose && \ RUN curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose && \

6
docker-bake.hcl
View File

@ -36,7 +36,7 @@ target "binary" {
platforms = ["local"] platforms = ["local"]
output = ["build"] output = ["build"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine" BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
PACKAGER_NAME = PACKAGER_NAME PACKAGER_NAME = PACKAGER_NAME
GO_STRIP = STRIP_TARGET GO_STRIP = STRIP_TARGET
@ -56,7 +56,7 @@ target "plugins" {
platforms = ["local"] platforms = ["local"]
output = ["build"] output = ["build"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine" BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
GO_STRIP = STRIP_TARGET GO_STRIP = STRIP_TARGET
} }
@ -146,7 +146,7 @@ target "e2e-image" {
output = ["type=docker"] output = ["type=docker"]
tags = ["${IMAGE_NAME}"] tags = ["${IMAGE_NAME}"]
args = { args = {
BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine" BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine"
VERSION = VERSION VERSION = VERSION
} }
} }