From d513c3becab5d1d1c4b14c2e7185242f887a468b Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Fri, 27 Jul 2018 18:13:16 +0800 Subject: [PATCH] Make sure that DOCKER_RAMDISK can be set correctly because we changed the user-docker directory (cherry picked from commit 9d3dd8796ed1815ef5f905db7e038f75c885213f) --- cmd/control/docker_init.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/control/docker_init.go b/cmd/control/docker_init.go index 3ae75c57..513efb16 100644 --- a/cmd/control/docker_init.go +++ b/cmd/control/docker_init.go @@ -70,8 +70,8 @@ func dockerInitAction(c *cli.Context) error { } for _, mount := range strings.Split(string(mountInfo), "\n") { - if strings.Contains(mount, "/var/lib/docker /var/lib/docker") && strings.Contains(mount, "rootfs") { - os.Setenv("DOCKER_RAMDISK", "1") + if strings.Contains(mount, "/var/lib/user-docker /var/lib/docker") && strings.Contains(mount, "rootfs") { + os.Setenv("DOCKER_RAMDISK", "true") } }