From 7e67862542050a57553e8550843242196a2662f8 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Mon, 8 Jul 2019 17:22:57 +0900
Subject: [PATCH] Bump CRIU to 3.12

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3b1c8ac6..db955ede 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,14 +45,10 @@ 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
+ENV CRIU_VERSION v3.12
 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