fix: prevent race condition with docker/moby install (Azure#447)

juhacket · Mar 14, 2019 · d8ae889 · d8ae889
1 parent 11aef4c
commit d8ae889
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -15,7 +15,7 @@ removeEtcd() {
 }
 
 removeMoby() {
-    sudo apt-get purge moby-engine moby-cli
+    sudo apt-get purge -y moby-engine moby-cli
 }
 
 installEtcd() {