From c8e6ad1adc48ba67bed5b752e53803410a730216 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 1 Dec 2020 17:02:42 -0800 Subject: [PATCH] Dockerfile: install criu from binary repo Signed-off-by: Kir Kolyshkin Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ccd460cd3..49e09eb20e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,26 +20,15 @@ ENV GO111MODULE=off FROM base AS criu ARG DEBIAN_FRONTEND -# Install dependency packages specific to criu +ADD --chmod=0644 https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/Release.key /etc/apt/trusted.gpg.d/criu.gpg.asc +# FIXME: temporarily doing a manual chmod as workaround for https://github.com/moby/buildkit/issues/2114 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 \ - apt-get update && apt-get install -y --no-install-recommends \ - libcap-dev \ - libnet-dev \ - libnl-3-dev \ - libprotobuf-c-dev \ - libprotobuf-dev \ - protobuf-c-compiler \ - protobuf-compiler \ - python-protobuf - -# Install CRIU for checkpoint/restore support -ARG CRIU_VERSION=3.14 -RUN mkdir -p /usr/src/criu \ - && curl -sSL https://github.com/checkpoint-restore/criu/archive/v${CRIU_VERSION}.tar.gz | tar -C /usr/src/criu/ -xz --strip-components=1 \ - && cd /usr/src/criu \ - && make \ - && make PREFIX=/build/ install-criu + chmod 0644 /etc/apt/trusted.gpg.d/criu.gpg.asc \ + && echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/ /' > /etc/apt/sources.list.d/criu.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends criu \ + && install -D /usr/sbin/criu /build/criu FROM base AS registry WORKDIR /go/src/github.com/docker/distribution @@ -309,7 +298,7 @@ COPY --from=swagger /build/ /usr/local/bin/ COPY --from=tomll /build/ /usr/local/bin/ COPY --from=tini /build/ /usr/local/bin/ COPY --from=registry /build/ /usr/local/bin/ -COPY --from=criu /build/ /usr/local/ +COPY --from=criu /build/ /usr/local/bin/ COPY --from=vndr /build/ /usr/local/bin/ COPY --from=gotestsum /build/ /usr/local/bin/ COPY --from=golangci_lint /build/ /usr/local/bin/