Merge pull request #1023 from joshwget/fix-image-preloading

Move preload directories and call wait-for-docker

images/02-preload/preload.sh

@@ -25,6 +25,7 @@ if [ -d ${BASE} ]; then
             CAT="cat ${path}"
             if [[ ${file} =~ \.t?gz$ ]]; then CAT="${CAT} | gunzip"; fi
             if [[ ${file} =~ \.t?xz$ ]]; then CAT="${CAT} | unxz"; fi
+            wait-for-docker
             CAT="${CAT} | docker load"
             echo loading from ${path}
             eval ${CAT} || :

os-config.tpl.yml

@@ -235,7 +235,8 @@ rancher:
       privileged: true
       volumes:
       - /var/run/system-docker.sock:/var/run/docker.sock
-      - /var/lib/system-docker/preload:/mnt/preload
+      - /var/lib/rancher/preload/system-docker:/mnt/preload
+      - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
       volumes_from:
       - command-volumes
       - system-volumes
@@ -247,8 +248,9 @@ rancher:
         io.rancher.os.after: console
       privileged: true
       volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /var/lib/docker/preload:/mnt/preload
+      - /var/run/:/var/run/
+      - /var/lib/rancher/preload/docker:/mnt/preload
+      - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
       volumes_from:
       - command-volumes
       - system-volumes