Patchwork D9396: packaging: drop Disco (19.04) and add Focal (20.04)

login
register
mail settings
Submitter phabricator
Date Nov. 25, 2020, 5:14 a.m.
Message ID <differential-rev-PHID-DREV-rvm3x6ld2pbgzufdackn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47675/
State Superseded
Headers show

Comments

phabricator - Nov. 25, 2020, 5:14 a.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Disco support ended in January 2020, and Focal does not have an announced EOL.
  
  Something is now installing and configuring `tzdata`, which was throwing up an
  interactive prompt to configure the timezone.  Aside from being hostile to
  automation, the prompt didn't actually accept input and hung the process.  This
  propagates the host's timezone into the image via environment variable in order
  to skip the prompt, and avoid hardcoding a value.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  Makefile
  contrib/packaging/Makefile
  contrib/packaging/docker/ubuntu.template
  contrib/packaging/dockerdeb

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/packaging/dockerdeb b/contrib/packaging/dockerdeb
--- a/contrib/packaging/dockerdeb
+++ b/contrib/packaging/dockerdeb
@@ -12,10 +12,12 @@ 
 
 OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
 CONTAINER=hg-docker-$PLATFORM
+TZ=`ls -la /etc/localtime | cut -d/ -f7-9`
 
 DOCKER=$($BUILDDIR/hg-docker docker-path)
 
 $BUILDDIR/hg-docker build \
+    --build-arg TZ=$TZ \
     --build-arg CODENAME=$CODENAME \
     $BUILDDIR/docker/$DISTID.template \
     $CONTAINER
diff --git a/contrib/packaging/docker/ubuntu.template b/contrib/packaging/docker/ubuntu.template
--- a/contrib/packaging/docker/ubuntu.template
+++ b/contrib/packaging/docker/ubuntu.template
@@ -3,6 +3,10 @@ 
 RUN groupadd -g 1000 build && \
     useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
 
+ARG DEBIAN_FRONTEND=noninteractive
+
+ENV TZ=%TZ%
+
 RUN apt-get update && apt-get install -y \
   build-essential \
   debhelper \
diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -9,7 +9,7 @@ 
   xenial \
   bionic \
   cosmic \
-  disco
+  focal
 
 FEDORA_RELEASE := 31
 
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,8 @@ 
   docker-ubuntu-xenial-ppa \
   docker-ubuntu-bionic \
   docker-ubuntu-bionic-ppa \
+  docker-ubuntu-focal \
+  docker-ubuntu-focal-ppa \
   fedora \
   linux-wheels \
   linux-wheels-x86_64 \