Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

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

Merged
merged 1 commit into from Feb 7, 2019

Conversation

CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon commented Feb 6, 2019

Reason for Change:

Cleaning up docker images in the background before installing docker can cause a race condition with docker install if we need to change the version of moby installed.

Issue Fixed:

Requirements:

Notes:

@@ -15,7 +15,7 @@ removeEtcd() {
}

removeMoby() {
sudo apt-get purge moby-engine moby-cli
sudo apt-get purge -y moby-engine moby-cli
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forgot to commit this in #407, needed to avoid force purge without prompt

@@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved this down to after container runtime is installed to avoid cleanup colliding with docker uninstall (if new version is needed)

@jackfrancis
Copy link
Member

lgtm

@codecov
Copy link

codecov bot commented Feb 6, 2019

Codecov Report

Merging #447 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #447   +/-   ##
=======================================
  Coverage   53.42%   53.42%           
=======================================
  Files          95       95           
  Lines       14385    14385           
=======================================
  Hits         7685     7685           
  Misses       6037     6037           
  Partials      663      663

@mboersma
Copy link
Member

mboersma commented Feb 6, 2019

/lgtm

@acs-bot
Copy link

acs-bot commented Feb 6, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, mboersma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [CecileRobertMichon,mboersma]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

@tariq1890 tariq1890 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm pending e2e

@acs-bot acs-bot merged commit 4235ca2 into Azure:master Feb 7, 2019
juhacket pushed a commit to juhacket/aks-engine that referenced this pull request Mar 14, 2019
@CecileRobertMichon CecileRobertMichon deleted the moby-y branch April 18, 2019 22:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants