@@ -40,13 +40,13 @@ FROM base AS criu
4040ARG DEBIAN_FRONTEND
4141# Install dependency packages specific to criu
4242RUN apt-get update && apt-get install -y --no-install-recommends \
43+ libcap-dev \
4344 libnet-dev \
45+ libnl-3-dev \
4446 libprotobuf-c-dev \
4547 libprotobuf-dev \
46- libnl-3-dev \
47- libcap-dev \
48- protobuf-compiler \
4948 protobuf-c-compiler \
49+ protobuf-compiler \
5050 python-protobuf \
5151 && rm -rf /var/lib/apt/lists/*
5252
@@ -112,14 +112,14 @@ FROM base AS cross-false
112112
113113FROM base AS cross-true
114114ARG DEBIAN_FRONTEND
115- RUN dpkg --add-architecture armhf
116115RUN dpkg --add-architecture arm64
117116RUN dpkg --add-architecture armel
117+ RUN dpkg --add-architecture armhf
118118RUN if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \
119119 apt-get update && apt-get install -y --no-install-recommends \
120- crossbuild-essential-armhf \
121120 crossbuild-essential-arm64 \
122121 crossbuild-essential-armel \
122+ crossbuild-essential-armhf \
123123 && rm -rf /var/lib/apt/lists/*; \
124124 fi
125125
@@ -140,12 +140,12 @@ ARG DEBIAN_FRONTEND
140140# other architectures cannnot crossbuild amd64.
141141RUN if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \
142142 apt-get update && apt-get install -y --no-install-recommends \
143- libseccomp-dev:armhf \
144- libseccomp-dev:arm64 \
145- libseccomp-dev:armel \
146- libapparmor-dev:armhf \
147143 libapparmor-dev:arm64 \
148144 libapparmor-dev:armel \
145+ libapparmor-dev:armhf \
146+ libseccomp-dev:arm64 \
147+ libseccomp-dev:armel \
148+ libseccomp-dev:armhf \
149149 # install this arches seccomp here due to compat issues with the v0 builder
150150 # This is as opposed to inheriting from runtime-dev-cross-false
151151 libapparmor-dev \
@@ -255,15 +255,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
255255 apparmor \
256256 aufs-tools \
257257 bash-completion \
258+ binutils-mingw-w64 \
258259 btrfs-tools \
260+ bzip2 \
261+ g++-mingw-w64-x86-64 \
259262 iptables \
260263 jq \
261264 libcap2-bin \
262265 libdevmapper-dev \
263- libudev-dev \
266+ libnet1 \
267+ libnl-3-200 \
268+ libprotobuf-c1 \
264269 libsystemd-dev \
265- binutils-mingw-w64 \
266- g++-mingw-w64-x86-64 \
270+ libudev-dev \
267271 net-tools \
268272 pigz \
269273 python3-pip \
@@ -273,12 +277,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
273277 vim \
274278 vim-common \
275279 xfsprogs \
276- zip \
277- bzip2 \
278280 xz-utils \
279- libprotobuf-c1 \
280- libnet1 \
281- libnl-3-200 \
281+ zip \
282282 && rm -rf /var/lib/apt/lists/*
283283
284284RUN pip3 install yamllint==1.16.0
0 commit comments