Skip to content

Commit 780c872

Browse files
iberryfulib-steffen
authored andcommitted
add retry when docker daemon not started (#220)
1 parent c6de838 commit 780c872

1 file changed

Lines changed: 30 additions & 10 deletions

File tree

src/job/entrypoint.sh

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,48 @@ mkdir -p /data/tmp
55
mkdir -p /data/repo
66
mkdir -p ~/.ssh
77

8-
if [ ! -e /var/run/docker.sock ]; then
9-
echo "Docker Daemon Config"
10-
cat /etc/docker/daemon.json
11-
echo ""
12-
13-
echo "Waiting for docker daemon to start up"
148

9+
function startDocker() {
1510
# Start docker daemon
1611
nohup dockerd-entrypoint.sh --storage-driver $INFRABOX_JOB_STORAGE_DRIVER --data-root /data/docker &> /tmp/dockerd.log &
17-
12+
sleep 5
1813
# Wait until daemon is ready
1914
COUNTER=0
2015
until docker version &> /dev/null; do
2116
let COUNTER=COUNTER+1
2217
sleep 1
2318

2419
if [ $COUNTER -gt 60 ]; then
25-
echo "Docker daemon not started" > '/dev/termination-log'
26-
cat /tmp/dockerd.log >> /dev/termination-log
27-
exit 1
20+
return 1
2821
fi
2922
done
23+
return 0
24+
}
25+
26+
27+
if [ ! -e /var/run/docker.sock ]; then
28+
echo "Docker Daemon Config"
29+
cat /etc/docker/daemon.json
30+
echo ""
31+
32+
echo "Waiting for docker daemon to start up"
33+
CNT=0
34+
while true; do
35+
if [ $CNT -gt 3 ]; then
36+
echo "Docker daemon not started" > '/dev/termination-log'
37+
cat /tmp/dockerd.log >> /dev/termination-log
38+
exit 1
39+
fi
40+
let CNT=CNT+1
41+
42+
if startDocker ; then
43+
echo "Docker daemon stared."
44+
break
45+
eles
46+
echo "Docker daemon not stared, retry"
47+
sleep 60
48+
fi
49+
done
3050
else
3151
echo "Using host docker daemon socket"
3252
fi

0 commit comments

Comments
 (0)