rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-02 07:24:28 +00:00
Code Issues Releases Wiki Activity

Move preload directories and call wait-for-docker

Browse Source
This commit is contained in:
Josh Curl 2016-06-16 23:08:02 -07:00
parent 21fce533b8
commit 9e82d7d768
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
images/02-preload/preload.sh
View File

@ -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} || :

8
os-config.tpl.yml
View File

@ -230,7 +230,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
@ -242,8 +243,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