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: sort packages alphabetically

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-10-05 22:56:32 +02:00
parent 1cfcce5e21
commit ee0ef6c535
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Dockerfile
View file

@ -18,13 +18,13 @@ ARG DEBIAN_FRONTEND
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 \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
libcap-dev \
libnet-dev \ libnet-dev \
libnl-3-dev \
libprotobuf-c-dev \ libprotobuf-c-dev \
libprotobuf-dev \ libprotobuf-dev \
libnl-3-dev \
libcap-dev \
protobuf-compiler \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \
python-protobuf python-protobuf
# Install CRIU for checkpoint/restore support # Install CRIU for checkpoint/restore support
@ -94,15 +94,15 @@ FROM base AS cross-false
FROM --platform=linux/amd64 base AS cross-true FROM --platform=linux/amd64 base AS cross-true
ARG DEBIAN_FRONTEND ARG DEBIAN_FRONTEND
RUN dpkg --add-architecture armhf
RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture arm64
RUN dpkg --add-architecture armel RUN dpkg --add-architecture armel
RUN dpkg --add-architecture armhf
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 \
crossbuild-essential-armhf \ crossbuild-essential-arm64 \
crossbuild-essential-arm64 \ crossbuild-essential-armel \
crossbuild-essential-armel crossbuild-essential-armhf
FROM cross-${CROSS} as dev-base FROM cross-${CROSS} as dev-base
@ -123,18 +123,17 @@ ARG DEBIAN_FRONTEND
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 \
libseccomp-dev:armhf \
libseccomp-dev:arm64 \
libseccomp-dev:armel \
libapparmor-dev:armhf \
libapparmor-dev:arm64 \ libapparmor-dev:arm64 \
libapparmor-dev:armel \ libapparmor-dev:armel \
libapparmor-dev:armhf \
libseccomp-dev:arm64 \
libseccomp-dev:armel \
libseccomp-dev:armhf \
# install this arches seccomp here due to compat issues with the v0 builder # install this arches seccomp here due to compat issues with the v0 builder
# This is as opposed to inheriting from runtime-dev-cross-false # This is as opposed to inheriting from runtime-dev-cross-false
libapparmor-dev \ libapparmor-dev \
libseccomp-dev libseccomp-dev
FROM runtime-dev-cross-${CROSS} AS runtime-dev FROM runtime-dev-cross-${CROSS} AS runtime-dev
FROM base AS tomlv FROM base AS tomlv
@ -262,15 +261,19 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
apparmor \ apparmor \
aufs-tools \ aufs-tools \
bash-completion \ bash-completion \
binutils-mingw-w64 \
btrfs-tools \ btrfs-tools \
bzip2 \
g++-mingw-w64-x86-64 \
iptables \ iptables \
jq \ jq \
libcap2-bin \ libcap2-bin \
libdevmapper-dev \ libdevmapper-dev \
libudev-dev \ libnet1 \
libnl-3-200 \
libprotobuf-c1 \
libsystemd-dev \ libsystemd-dev \
binutils-mingw-w64 \ libudev-dev \
g++-mingw-w64-x86-64 \
net-tools \ net-tools \
pigz \ pigz \
python3-pip \ python3-pip \
@ -280,12 +283,8 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
vim \ vim \
vim-common \ vim-common \
xfsprogs \ xfsprogs \
zip \
bzip2 \
xz-utils \ xz-utils \
libprotobuf-c1 \ zip
libnet1 \
libnl-3-200
RUN pip3 install yamllint==1.16.0 RUN pip3 install yamllint==1.16.0