From 141c5c7c4521ca6aaf00858b5455dd2da1a1fe41 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 9 Jan 2018 17:00:35 +0000 Subject: [PATCH 01/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 871a1da..21fffad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -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" \ From 54decdc4d851a0728caff5c6fe67a25c4f5ccb4e Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 9 Jan 2018 17:07:09 +0000 Subject: [PATCH 02/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 21fffad..8def057 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=4 ARCH=x86_64 +ENV VERSION=0 RELEASE=5 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 02074238e84da4e2a53a912af10ac00137deeb7c Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 9 Jan 2018 22:38:08 +0000 Subject: [PATCH 03/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8def057..4a97e4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=5 ARCH=x86_64 +ENV VERSION=0 RELEASE=6 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From c28e5ad8b62128e96f8906622176b03dbeb6c65f Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 10 Jan 2018 00:48:54 +0100 Subject: [PATCH 04/23] 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 6eeaf03949fd54d5919f2279ad322a8961ee0d4c Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 00:05:26 +0000 Subject: [PATCH 05/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4a97e4b..f03c1f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=6 ARCH=x86_64 +ENV VERSION=0 RELEASE=7 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From ed2becd74c30e2e5160ef514c98e04d1b12d9020 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 00:25:16 +0000 Subject: [PATCH 06/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f03c1f4..9ffbd6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=7 ARCH=x86_64 +ENV VERSION=0 RELEASE=8 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From f9d688ac7081b7704a91a6de929486ff00c1dae2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 10 Jan 2018 09:52:55 +0100 Subject: [PATCH 07/23] 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 9ffbd6a..f78c927 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=8 ARCH=x86_64 +ENV VERSION=0 RELEASE=9 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 - - - - - From f7e3d50b2eb09838828a5ce0e75beb6478625157 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 13:18:45 +0000 Subject: [PATCH 08/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f78c927..4728a12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=9 ARCH=x86_64 +ENV VERSION=0 RELEASE=10 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From a9950eb8a683425cc4c591a6add880daa84fba04 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 13:21:29 +0000 Subject: [PATCH 09/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4728a12..e7fd2c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=10 ARCH=x86_64 +ENV VERSION=0 RELEASE=11 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 2bbd050f13d1ffbdd3e6877bf798cbb62e6dd7c1 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 22:35:53 +0000 Subject: [PATCH 10/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e7fd2c6..fd078dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=11 ARCH=x86_64 +ENV VERSION=0 RELEASE=12 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 6ec57ecdf4a3dc8a6bc3f2557b9a8f3201a21ded Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:04:45 +0000 Subject: [PATCH 11/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd078dd..66a5c38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=12 ARCH=x86_64 +ENV VERSION=0 RELEASE=13 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From dbbedc8e913d5d2e96a615fe141bc4e6ac1b6a63 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:18:44 +0000 Subject: [PATCH 12/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 66a5c38..6a5a14c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=13 ARCH=x86_64 +ENV VERSION=0 RELEASE=14 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From ad656dbee62df841fb1b5ec88c381d44dfb00f58 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:25:18 +0000 Subject: [PATCH 13/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a5a14c..5dde773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=14 ARCH=x86_64 +ENV VERSION=0 RELEASE=15 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 301acd2f0396888666be53301d950e8f50b61647 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 16 Feb 2018 14:59:03 +0000 Subject: [PATCH 14/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5dde773..bc4d221 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=15 ARCH=x86_64 +ENV VERSION=0 RELEASE=16 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From ebdbc0959a8b560aa51bc198bc56ac435052338a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 17:01:25 +0000 Subject: [PATCH 15/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bc4d221..47dbcb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=16 ARCH=x86_64 +ENV VERSION=0 RELEASE=17 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 277b364e61b07929d2318bda42377860e754f0a6 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 18:31:50 +0000 Subject: [PATCH 16/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 47dbcb3..837022c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=17 ARCH=x86_64 +ENV VERSION=0 RELEASE=18 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 57088507cb9a0553e961986b75a7b7f9437e8028 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 15:31:08 +0000 Subject: [PATCH 17/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 837022c..e6d20e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=18 ARCH=x86_64 +ENV VERSION=0 RELEASE=19 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 2fee8e326a24087549a74c79f96a1ef8e522fe3d Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 29 Mar 2018 14:12:15 +0000 Subject: [PATCH 18/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e6d20e6..a8e74ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=19 ARCH=x86_64 +ENV VERSION=0 RELEASE=20 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From ee0e719bb639582ef9aaf3838e3a1c48d8282f66 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 14:10:58 +0000 Subject: [PATCH 19/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8e74ab..3b9778d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=20 ARCH=x86_64 +ENV VERSION=0 RELEASE=21 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 098a87e0fc8b6c95aa36bdbab7f063e5bc2ac879 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 15:53:19 +0000 Subject: [PATCH 20/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b9778d..e3ccdde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=21 ARCH=x86_64 +ENV VERSION=0 RELEASE=22 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 110a65f2bedcfeabcd940b26b4879fd670dab5d9 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 6 Jul 2018 13:41:34 +0000 Subject: [PATCH 21/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3ccdde..6131239 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=22 ARCH=x86_64 +ENV VERSION=0 RELEASE=23 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 3f2f8afc7e20f67cca9ae7ec893a78f3f4cfe19f Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 13:03:35 +0000 Subject: [PATCH 22/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6131239..8670865 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=23 ARCH=x86_64 +ENV VERSION=0 RELEASE=24 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \ From 8501c42bda25b2b871ddd32c07fc43d83135bfe9 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 18:45:58 +0000 Subject: [PATCH 23/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8670865..6374d79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:27 -ENV VERSION=0 RELEASE=24 ARCH=x86_64 +ENV VERSION=0 RELEASE=25 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ name="$FGC/cri-o" \ version="$VERSION" \