Patchwork D6911: automation: always install docker-ce

login
register
mail settings
Submitter phabricator
Date Sept. 29, 2019, 7:08 p.m.
Message ID <differential-rev-PHID-DREV-y4c7qqegvfzyxz4qo7zh-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/41834/
State Superseded
Headers show

Comments

phabricator - Sept. 29, 2019, 7:08 p.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Docker has published packages for Ubuntu Disco and we no longer
  need this one-off.

REPOSITORY
  rHG Mercurial

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.