From ef0a7b9acc5e064a0e3182c998e5d343246808c2 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 17:04:47 +0000 Subject: [PATCH 01/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cecde21..b5920b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:rawhide -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 cfd0c691554c18b6b96e72ab005368283d2fc653 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 16:01:02 +0000 Subject: [PATCH 02/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b5920b5..a3ea805 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:rawhide -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 b86de1de646039a0f0b212e796ef745aaf0e89e3 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 16 May 2018 09:59:26 +0200 Subject: [PATCH 03/13] Dockerfile: update FROM Signed-off-by: Giuseppe Scrivano --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3ea805..a8356b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:28 ENV VERSION=0 RELEASE=6 ARCH=x86_64 LABEL com.redhat.component="cri-o" \ From c3bcd9c98e00bf4f844241289ca72658aedac133 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 16 May 2018 10:28:22 +0200 Subject: [PATCH 04/13] Dockerfile: bump release Signed-off-by: Giuseppe Scrivano --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8356b0..0851826 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 1792068e28ea5f179eb546fdb9d63be02781d3e1 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 16 May 2018 15:48:33 +0200 Subject: [PATCH 05/13] cri-o: sync from upstream Signed-off-by: Giuseppe Scrivano --- Dockerfile | 4 +--- config.json.template | 46 ++++++++++++++++++++++---------------------- manifest.json | 3 ++- run.sh | 2 +- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0851826..1e7bae2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,15 +13,13 @@ LABEL com.redhat.component="cri-o" \ COPY README.md / -RUN dnf install --setopt=tsflags=nodocs -y iptables cri-o iproute runc && \ +RUN dnf install --setopt=tsflags=nodocs -y iptables cri-o socat iproute runc && \ rpm -V iptables cri-o iproute runc && \ dnf clean all && \ mkdir -p /exports/hostfs/etc/crio /exports/hostfs/opt/cni/bin/ /exports/hostfs/var/lib/containers/storage/ && \ cp /etc/crio/* /exports/hostfs/etc/crio && \ if test -e /usr/libexec/cni; then cp -Lr /usr/libexec/cni/* /exports/hostfs/opt/cni/bin/; fi -RUN sed -i '/storage_option =/s/.*/&\n"overlay.override_kernel_check=1",/' /exports/hostfs/etc/crio/crio.conf - COPY manifest.json tmpfiles.template config.json.template service.template /exports/ COPY set_mounts.sh / diff --git a/config.json.template b/config.json.template index 0642fbc..ae42db6 100644 --- a/config.json.template +++ b/config.json.template @@ -258,6 +258,17 @@ "source": "/tmp", "type": "bind" }, + { + "destination": "/var/tmp", + "options": [ + "private", + "bind", + "rw", + "mode=755" + ], + "source": "/var/tmp", + "type": "bind" + }, { "destination": "/etc", "options": [ @@ -291,28 +302,6 @@ "source": "/root", "type": "bind" }, - { - "destination": "/home", - "options": [ - "rbind", - "rprivate", - "rw", - "mode=755" - ], - "source": "/home", - "type": "bind" - }, - { - "destination": "/mnt", - "options": [ - "rbind", - "rw", - "rprivate", - "mode=755" - ], - "source": "/mnt", - "type": "bind" - }, { "type": "bind", "source": "${RUN_DIRECTORY}", @@ -390,7 +379,7 @@ "options": [ "rbind", "rprivate", - "ro", + "rw", "mode=755" ], "source": "${OPT_CNI}", @@ -407,6 +396,16 @@ "source": "/dev", "type": "bind" }, + { + "destination": "/host", + "options": [ + "rbind", + "rshared", + "rw" + ], + "source": "/", + "type": "bind" + }, { "destination": "/sys", "options": [ @@ -428,5 +427,6 @@ "source": "/proc", "type": "proc" } + $ADDTL_MOUNTS ] } diff --git a/manifest.json b/manifest.json index 38f4dc8..bbebea6 100644 --- a/manifest.json +++ b/manifest.json @@ -5,6 +5,7 @@ "OPT_CNI" : "/opt/cni", "VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage", "VAR_LIB_ORIGIN" : "/var/lib/origin", - "VAR_LIB_KUBE" : "/var/lib/kubelet" + "VAR_LIB_KUBE" : "/var/lib/kubelet", + "ADDTL_MOUNTS" : "" } } diff --git a/run.sh b/run.sh index 7f34fd4..25e0285 100755 --- a/run.sh +++ b/run.sh @@ -8,4 +8,4 @@ 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 +exec /usr/bin/crio --bind-mount-prefix=/host --log-level=$LOG_LEVEL From 4cbf0fbbc27cb6616985ead428cee9db09769430 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 14:19:37 +0000 Subject: [PATCH 06/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e7bae2..69e45ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 96b7f9263aeb1db2da16a9ee8b1add58fffd59d8 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 17:56:26 +0000 Subject: [PATCH 07/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 69e45ea..0326ccf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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" \ From a83b4af53cdcc70b8d773e91e49150e15494e0dc Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 30 May 2018 19:20:39 +0000 Subject: [PATCH 08/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0326ccf..8ad9ac6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 e1055f9a7385cdaf9c473b284aa3f25eac0c10b6 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 9 Jul 2018 13:31:57 +0000 Subject: [PATCH 09/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ad9ac6..b496eb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 3e057f36cc27cab6652600aab93349c700543bc6 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Jul 2018 13:09:59 +0000 Subject: [PATCH 10/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b496eb9..33cdb80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 fe73d4a33496b26cfa4edbc50fa5eeffcb7b87db Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 24 Jul 2018 18:51:32 +0000 Subject: [PATCH 11/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33cdb80..02adb72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 a06b9215ee2b37623583647e89c6b407f4dc7824 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 17 Sep 2018 19:43:30 +0000 Subject: [PATCH 12/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02adb72..3bd80aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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 4c9767edae580fb8afcc466edd459c742bec20cf Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 21 Sep 2018 15:58:43 +0000 Subject: [PATCH 13/13] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3bd80aa..4d33970 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -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" \