Patchwork D6911: automation: always install docker-ce

login
register
mail settings
Submitter phabricator
Date Sept. 30, 2019, 9:06 p.m.
Message ID <ebe42e357d80d7c771887a912fd259e0@localhost.localdomain>
Download mbox | patch
Permalink /patch/41859/
State Not Applicable
Headers show

Comments

phabricator - Sept. 30, 2019, 9:06 p.m.
Closed by commit rHG136c2536d83f: automation: always install docker-ce (authored by indygreg).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6911?vs=16684&id=16706

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6911/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6911

AFFECTED FILES
  contrib/automation/hgautomation/linux.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/contrib/automation/hgautomation/linux.py b/contrib/automation/hgautomation/linux.py
--- a/contrib/automation/hgautomation/linux.py
+++ b/contrib/automation/hgautomation/linux.py
@@ -219,6 +219,7 @@ 
     darcs \
     debhelper \
     devscripts \
+    docker-ce \
     dpkg-dev \
     dstat \
     emacs \
@@ -282,12 +283,6 @@ 
     PACKAGES="$PACKAGES monotone"
 fi
 
-# As of April 27, 2019, Docker hasn't published packages for
-# Ubuntu 19.04 yet.
-if [ "$LSB_RELEASE" != "disco" ]; then
-    PACKAGES="$PACKAGES docker-ce"
-fi
-
 sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends $PACKAGES
 
 # Create clang-format symlink so test harness finds it.