rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-14 14:11:18 +00:00
Code Issues Releases Wiki Activity

Add /usr/local/bin or /opt/bin to PATH for docker-init

Browse Source
This commit is contained in:
Darren Shepherd
2016-06-06 19:31:46 -07:00
parent 57a2f99484
commit 751b71564e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
images/02-console/docker-init
View File

@@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -e
if [ -e /var/lib/rancher/conf/docker ]; then if [ -e /var/lib/rancher/conf/docker ]; then
source /var/lib/rancher/conf/docker source /var/lib/rancher/conf/docker
@@ -9,8 +10,13 @@ while [ ! -e /run/console-done ]; do
done done
DOCKER_BIN=$(which docker) || DOCKER_BIN=/usr/bin/docker DOCKER_BIN=$(which docker) || DOCKER_BIN=/usr/bin/docker
if [ "$DOCKER_BIN" == "/usr/bin/docker" ] && [ -e /usr/local/bin/docker ]; then
DOCKER_BIN=/usr/local/bin/docker for i in /opt/bin /usr/local/bin; do
fi if [ -x ${i}/docker ]; then
PATH=${i}:$PATH
DOCKER_BIN=${i}/docker
break
fi
done
exec /usr/bin/dockerlaunch $DOCKER_BIN "$@" $DOCKER_OPTS >/var/log/docker.log 2>&1 exec /usr/bin/dockerlaunch $DOCKER_BIN "$@" $DOCKER_OPTS >/var/log/docker.log 2>&1