Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

add timeout to restart docker #2457

Merged
merged 8 commits into from
Mar 19, 2018
Merged

add timeout to restart docker #2457

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5ac8dd
add retry to restart docker
Mar 13, 2018
ef40714
remove retry
Mar 14, 2018
19218db
test
Mar 16, 2018
ae253db
space
Mar 16, 2018
89e00ce
readd timeout
Mar 16, 2018
a5373c4
remove timeout
Mar 16, 2018
3418831
Revert "remove timeout"
Mar 16, 2018
0e0f0e7
add /bin/
Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions parts/k8s/kubernetesmastercustomscript.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,11 @@ function ensureDocker() {
systemctlEnableAndCheck docker
# only start if a reboot is not required
if ! $REBOOTREQUIRED; then
systemctl restart docker
dockerStarted=1
for i in {1..900}; do
if ! /usr/bin/docker info; then
echo "status $?"
/bin/systemctl restart docker
timeout 60s /bin/systemctl restart docker
else
echo "docker started, took $i seconds"
dockerStarted=0
Expand Down