kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Dockerfile: update to debian bullseye

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-08-19 21:16:01 +02:00
parent 7e67bc067f
commit 43c6a3d359
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Dockerfile
View file

@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0 ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_BUILDTAGS="apparmor seccomp" ARG DOCKER_BUILDTAGS="apparmor seccomp"
ARG BASE_DEBIAN_DISTRO="buster" ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
FROM ${GOLANG_IMAGE} AS base FROM ${GOLANG_IMAGE} AS base
@ -23,7 +23,7 @@ ARG DEBIAN_FRONTEND
ADD --chmod=0644 https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/Release.key /etc/apt/trusted.gpg.d/criu.gpg.asc ADD --chmod=0644 https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/Release.key /etc/apt/trusted.gpg.d/criu.gpg.asc
RUN --mount=type=cache,sharing=locked,id=moby-criu-aptlib,target=/var/lib/apt \ RUN --mount=type=cache,sharing=locked,id=moby-criu-aptlib,target=/var/lib/apt \
--mount=type=cache,sharing=locked,id=moby-criu-aptcache,target=/var/cache/apt \ --mount=type=cache,sharing=locked,id=moby-criu-aptcache,target=/var/cache/apt \
&& echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/ /' > /etc/apt/sources.list.d/criu.list \ echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/ /' > /etc/apt/sources.list.d/criu.list \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends criu \ && apt-get install -y --no-install-recommends criu \
&& install -D /usr/sbin/criu /build/criu && install -D /usr/sbin/criu /build/criu
@ -110,7 +110,6 @@ FROM cross-${CROSS} as dev-base
FROM dev-base AS runtime-dev-cross-false FROM dev-base AS runtime-dev-cross-false
ARG DEBIAN_FRONTEND ARG DEBIAN_FRONTEND
RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list
RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib/apt \ RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib/apt \
--mount=type=cache,sharing=locked,id=moby-cross-false-aptcache,target=/var/cache/apt \ --mount=type=cache,sharing=locked,id=moby-cross-false-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
@ -119,16 +118,14 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib
libapparmor-dev \ libapparmor-dev \
libbtrfs-dev \ libbtrfs-dev \
libdevmapper-dev \ libdevmapper-dev \
libseccomp-dev/buster-backports \ libseccomp-dev \
libsystemd-dev \ libsystemd-dev \
libudev-dev libudev-dev
FROM --platform=linux/amd64 runtime-dev-cross-false AS runtime-dev-cross-true FROM --platform=linux/amd64 runtime-dev-cross-false AS runtime-dev-cross-true
ARG DEBIAN_FRONTEND ARG DEBIAN_FRONTEND
# These crossbuild packages rely on gcc-<arch>, but this doesn't want to install # These crossbuild packages rely on gcc-<arch>, but this doesn't want to install
# on non-amd64 systems. # on non-amd64 systems, so other architectures cannnot crossbuild amd64.
# Additionally, the crossbuild-amd64 is currently only on debian:buster, so
# other architectures cannnot crossbuild amd64.
RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \ RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \
--mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \ --mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
@ -254,6 +251,8 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
apparmor \ apparmor \
bash-completion \ bash-completion \
bzip2 \ bzip2 \
inetutils-ping \
iproute2 \
iptables \ iptables \
jq \ jq \
libcap2-bin \ libcap2-bin \

2
Dockerfile.e2e
View file

@ -66,7 +66,9 @@ RUN apk --no-cache add \
ca-certificates \ ca-certificates \
g++ \ g++ \
git \ git \
inetutils-ping \
iptables \ iptables \
libcap2-bin \
pigz \ pigz \
tar \ tar \
xz xz

5
Dockerfile.simple
View file

@ -7,7 +7,10 @@
ARG GO_VERSION=1.16.7 ARG GO_VERSION=1.16.7
FROM golang:${GO_VERSION}-buster ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
FROM ${GOLANG_IMAGE}
ENV GO111MODULE=off ENV GO111MODULE=off
# allow replacing httpredir or deb mirror # allow replacing httpredir or deb mirror