From 403986c5dd078a9d528794aee0b38dc742ee072b Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 20 Dec 2018 16:40:05 +0000 Subject: [PATCH] Add CRIU patch to fix checkpoint test For the newly integrated feature to use CRIU configuration files the test is broken without an additional CRIU patch. The test changes CRIU's log file. Changing the log file is unfortunately the only thing which is in broken in CRIU 3.11. But it is the easiest option for testing. With CRIU 3.12 this will be fixed. All other CRIU options can be changed with a CRIU configuration file. With this change the CRIU 3.11 feature can be merged into runc with a test and for the user it should just work, if they are not trying to change CRIU's log file. Signed-off-by: Adrian Reber --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5fd8f1a3c..3b1c8ac6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,10 +45,14 @@ RUN cd /tmp \ && rm -rf /tmp/bats # install criu +# For CRIU 3.11 one patch is needed for the test 'checkpoint and restore with container specific CRIU config' +# This should be no longer necessary with CRIU 3.12 +# See https://github.com/opencontainers/runc/pull/1933 ENV CRIU_VERSION v3.11 RUN mkdir -p /usr/src/criu \ && curl -sSL https://github.com/checkpoint-restore/criu/archive/${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \ && cd /usr/src/criu \ + && curl https://github.com/checkpoint-restore/criu/commit/bb0b2f2635d71e549851b7c626a1464e42a3b5c7.patch | patch -p1 \ && make install-criu \ && rm -rf /usr/src/criu