# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2019-09-29 17:19:02
# Node ID 136c2536d83fb3214112f6d7d4437c335812755b
# Parent  198b51d453fea5fb02bb91360b279cf89477e88f

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

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 @@ PACKAGES="\
     darcs \
     debhelper \
     devscripts \
+    docker-ce \
     dpkg-dev \
     dstat \
     emacs \
@@ -282,12 +283,6 @@ if [ "$LSB_RELEASE" != "disco" ]; then
     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.