From e22b3fce534d1f5e264e2f1f23a0eed90c9dc85b Mon Sep 17 00:00:00 2001
From: Cecile Robert-Michon <cerobert@microsoft.com>
Date: Mon, 19 Mar 2018 16:56:56 -0700
Subject: [PATCH] add timeout to restart docker (#2457)

---
 parts/k8s/kubernetesmastercustomscript.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/parts/k8s/kubernetesmastercustomscript.sh b/parts/k8s/kubernetesmastercustomscript.sh
index 4a04b01960..312824f2cb 100644
--- a/parts/k8s/kubernetesmastercustomscript.sh
+++ b/parts/k8s/kubernetesmastercustomscript.sh
@@ -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