diff --git a/Dockerfile b/Dockerfile index 4badcf8113..c52476c637 100644 --- a/Dockerfile +++ b/Dockerfile @@ -154,8 +154,10 @@ RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint && go install -v github.com/golang/lint/golint # Install CRIU for checkpoint/restore support -ENV CRIU_VERSION 2.9 -RUN mkdir -p /usr/src/criu \ +ENV CRIU_VERSION 2.12.1 +# Install dependancy packages specific to criu +RUN apt-get install libnet-dev -y && \ + mkdir -p /usr/src/criu \ && curl -sSL https://github.com/xemul/criu/archive/v${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \ && cd /usr/src/criu \ && make \ diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits index 50f8f341df..4f85d9173c 100644 --- a/hack/dockerfile/binaries-commits +++ b/hack/dockerfile/binaries-commits @@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly RUNC_COMMIT=9c2d8d184e5da67c95d601382adf14862e4f2228 -CONTAINERD_COMMIT=422e31ce907fd9c3833a38d7b8fdd023e5a76e73 +CONTAINERD_COMMIT=9048e5e50717ea4497b757314bad98ea3763c145 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e VNDR_COMMIT=19220953c4a45310a4c404b7905154e29120249e diff --git a/vendor.conf b/vendor.conf index 7a3a1fe9d8..23e9bea77d 100644 --- a/vendor.conf +++ b/vendor.conf @@ -101,7 +101,7 @@ google.golang.org/genproto b3e7c2fb04031add52c4817f53f43757ccbf9c18 github.com/docker/docker-credential-helpers v0.5.0 # containerd -github.com/docker/containerd 422e31ce907fd9c3833a38d7b8fdd023e5a76e73 +github.com/docker/containerd 9048e5e50717ea4497b757314bad98ea3763c145 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4 # cluster