From a62837de65f8e2c0a40c6be021c80dc7de82f8d6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 17 Nov 2017 14:13:35 +0100 Subject: [PATCH 1/3] base master on rawhide --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 871a1da..2c837b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:27 +FROM registry.fedoraproject.org/fedora:rawhide ENV VERSION=0 RELEASE=3 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ From b1ca09f903e67821dbe56628277fecf07a7de6c7 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 10 Jan 2018 00:48:54 +0100 Subject: [PATCH 2/3] Disable the auto-build. That's not working with that flag Signed-off-by: Patrick Uiterwijk --- .osbs-repo-config | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .osbs-repo-config diff --git a/.osbs-repo-config b/.osbs-repo-config deleted file mode 100644 index d2914e4..0000000 --- a/.osbs-repo-config +++ /dev/null @@ -1,3 +0,0 @@ -[autorebuild] -enabled = true - From 8e4793fa51c3c95dcc7028591d41a3998db650e0 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 10 Jan 2018 09:53:53 +0100 Subject: [PATCH 3/3] sync with upstream Signed-off-by: Giuseppe Scrivano --- Dockerfile | 2 +- run.sh | 3 +++ service.template | 1 + tmpfiles.template | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c837b6..cecde21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:rawhide -ENV VERSION=0 RELEASE=3 ARCH=x86_64 +ENV VERSION=0 RELEASE=4 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ diff --git a/run.sh b/run.sh index 5621a7b..7f34fd4 100755 --- a/run.sh +++ b/run.sh @@ -5,4 +5,7 @@ PID=$$ LABEL=`tr -d '\000' < /proc/$PID/attr/current` printf %s $LABEL > /proc/self/attr/exec +test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage +test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network + exec /usr/bin/crio --log-level=$LOG_LEVEL diff --git a/service.template b/service.template index daa9ffd..4c08b39 100644 --- a/service.template +++ b/service.template @@ -14,6 +14,7 @@ TasksMax=infinity LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity +TimeoutStartSec=0 [Install] WantedBy=multi-user.target diff --git a/tmpfiles.template b/tmpfiles.template index 015919c..9447267 100644 --- a/tmpfiles.template +++ b/tmpfiles.template @@ -1,4 +1,4 @@ -d ${RUN_DIRECTORY}/${NAME} - - - - - +d ${RUN_DIRECTORY}/crio - - - - - d /etc/crio - - - - - Z /etc/crio - - - - - d ${STATE_DIRECTORY}/origin - - - - -