Mercurial > hg

changeset 43012:136c2536d83f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
automation: always install docker-ce Docker has published packages for Ubuntu Disco and we no longer need this one-off. Differential Revision: https://phab.mercurial-scm.org/D6911
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 29 Sep 2019 10:19:02 -0700
parents 198b51d453fe
children 3aa227feffbe
files contrib/automation/hgautomation/linux.py
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/automation/hgautomation/linux.py	Sun Sep 29 10:17:20 2019 -0700
+++ b/contrib/automation/hgautomation/linux.py	Sun Sep 29 10:19:02 2019 -0700
@@ -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.