From d8ae889fd19384dc74c673d1fffc7e5875e4e4b8 Mon Sep 17 00:00:00 2001
From: Cecile Robert-Michon <cerobert@microsoft.com>
Date: Wed, 6 Feb 2019 16:04:39 -0800
Subject: [PATCH] fix: prevent race condition with docker/moby install (#447)

---
 parts/k8s/kubernetescustomscript.sh | 5 ++++-
 parts/k8s/kubernetesinstalls.sh     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/parts/k8s/kubernetescustomscript.sh b/parts/k8s/kubernetescustomscript.sh
index 227475fe385..53a3b36287f 100755
--- a/parts/k8s/kubernetescustomscript.sh
+++ b/parts/k8s/kubernetescustomscript.sh
@@ -46,7 +46,6 @@ if [ -f /var/log/azure/golden-image-install.complete ]; then
     echo "detected golden image pre-install"
     FULL_INSTALL_REQUIRED=false
     rm -rf /home/packer
-    cleanUpContainerImages
 else
     FULL_INSTALL_REQUIRED=true
 fi
@@ -165,6 +164,10 @@ echo `date`,`hostname`, endcustomscript>>/opt/m
 mkdir -p /opt/azure/containers && touch /opt/azure/containers/provision.complete
 ps auxfww > /opt/azure/provision-ps.log &
 
+if ! $FULL_INSTALL_REQUIRED; then
+    cleanUpContainerImages
+fi
+
 if $REBOOTREQUIRED; then
   echo 'reboot required, rebooting node in 1 minute'
   /bin/bash -c "shutdown -r 1 &"
diff --git a/parts/k8s/kubernetesinstalls.sh b/parts/k8s/kubernetesinstalls.sh
index 97d119573b8..5cea9ffead1 100755
--- a/parts/k8s/kubernetesinstalls.sh
+++ b/parts/k8s/kubernetesinstalls.sh
@@ -15,7 +15,7 @@ removeEtcd() {
 }
 
 removeMoby() {
-    sudo apt-get purge moby-engine moby-cli
+    sudo apt-get purge -y moby-engine moby-cli
 }
 
 installEtcd() {