From c64b4233046ff951c69a2126e7694e2de212f2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 21 Apr 2018 17:33:19 +0200 Subject: [PATCH 1/4] Add /var/lib/containers to the list of bindmounts --- deploy/iso/minikube-iso/package/automount/minikube-automount | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy/iso/minikube-iso/package/automount/minikube-automount b/deploy/iso/minikube-iso/package/automount/minikube-automount index 041689abb517..9e0fb740e3a2 100755 --- a/deploy/iso/minikube-iso/package/automount/minikube-automount +++ b/deploy/iso/minikube-iso/package/automount/minikube-automount @@ -124,6 +124,10 @@ if [ -n "$BOOT2DOCKER_DATA" ]; then mkdir -p /var/lib/docker mount --bind /mnt/$PARTNAME/var/lib/docker /var/lib/docker + mkdir -p /mnt/$PARTNAME/var/lib/containers + mkdir -p /var/lib/containers + mount --bind /mnt/$PARTNAME/var/lib/containers /var/lib/containers + mkdir -p /mnt/$PARTNAME/var/log mkdir /var/log mount --bind /mnt/$PARTNAME/var/log /var/log From 25e28c392ffe2d0add4c84efa2237baae8e39eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 21 Apr 2018 17:58:47 +0200 Subject: [PATCH 2/4] Use the standard root dir, and minikube-automount --- deploy/iso/minikube-iso/package/crio-bin/crio.service | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service index 15419de42e5c..e1b72ac889af 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.service +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.service @@ -10,11 +10,9 @@ EnvironmentFile=-/etc/sysconfig/crio EnvironmentFile=-/etc/sysconfig/crio.minikube EnvironmentFile=/var/run/minikube/env Environment=GOTRACEBACK=crash -ExecStartPre=/bin/mkdir -p ${PERSISTENT_DIR}/var/lib/containers ExecStart=/usr/bin/crio \ $CRIO_OPTIONS \ - $CRIO_MINIKUBE_OPTIONS \ - --root ${PERSISTENT_DIR}/var/lib/containers + $CRIO_MINIKUBE_OPTIONS ExecReload=/bin/kill -s HUP $MAINPID TasksMax=8192 LimitNOFILE=1048576 From 9f8ba5ffe6a992a3e4e0c909cbf3fd6b3f882fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 21 Apr 2018 21:13:39 +0200 Subject: [PATCH 3/4] Add registries entry for docker.io registry --- deploy/iso/minikube-iso/package/crio-bin/crio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf index 57bb08822438..c2abac5190f7 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.conf +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.conf @@ -146,6 +146,7 @@ insecure_registries = [ # registries is used to specify a comma separated list of registries to be used # when pulling an unqualified image (e.g. fedora:rawhide). registries = [ + "docker.io" ] # The "crio.network" table contains settings pertaining to the From da203377bec30bef04e452a204b47170851e05cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 21 Apr 2018 21:23:36 +0200 Subject: [PATCH 4/4] Set storage driver explictly in the crio.conf crio.conf(5) says: storage_driver="" CRIO storage driver (default is "overlay") Note: overlay and overlay2 are the same driver --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 2 +- deploy/iso/minikube-iso/package/crio-bin/crio.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 73231183f7aa..856bced0261f 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -58,7 +58,7 @@ define CRIO_BIN_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/containers/policy.json mkdir -p $(TARGET_DIR)/etc/sysconfig - echo 'CRIO_OPTIONS="--storage-driver=overlay2 --log-level=debug"' > $(TARGET_DIR)/etc/sysconfig/crio + echo 'CRIO_OPTIONS="--log-level=debug"' > $(TARGET_DIR)/etc/sysconfig/crio endef define CRIO_BIN_INSTALL_INIT_SYSTEMD diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf index c2abac5190f7..2aef1f8ff829 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.conf +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.conf @@ -12,7 +12,7 @@ runroot = "/var/run/containers/storage" # storage_driver select which storage driver is used to manage storage # of images and containers. -storage_driver = "" +storage_driver = "overlay" # storage_option is used to pass an option to the storage driver. storage_option = [