github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 20:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Wait for docker to finish starting up before terminateing init script

Browse Source 
This means dependent services can rely on docker being up.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-07-15 11:29:32 +01:00
parent 37cd71fa0d
commit 498c481700
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/packages/diagnostics/diagnostics
View File

@ -1,8 +1,5 @@
#!/bin/sh #!/bin/sh
# now start very soon after docker, let containerd start
sleep 1
printf '\n' printf '\n'
DEV=$(ls /dev | grep '[sxv]da$') DEV=$(ls /dev | grep '[sxv]da$')
[ $? -eq 0 ] && printf "✓ Drive found: $DEV\n" || printf "✗ No drive found\n" [ $? -eq 0 ] && printf "✓ Drive found: $DEV\n" || printf "✗ No drive found\n"

2
alpine/packages/docker/etc/init.d/docker
View File

@ -75,6 +75,8 @@ start()
--stdout "${DOCKER_LOGFILE}" \ --stdout "${DOCKER_LOGFILE}" \
-- --pidfile=${pidfile} ${DOCKER_OPTS} -- --pidfile=${pidfile} ${DOCKER_OPTS}
ewaitfile 20 ${pidfile} /var/run/docker.sock /var/run/docker/libcontainerd/docker-containerd.sock
eend $? "Failed to start docker" eend $? "Failed to start docker"
} }