Mercurial > hg-stable

changeset 45983:971424517e17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: drop Disco (19.04) and add Focal (20.04) 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. Differential Revision: https://phab.mercurial-scm.org/D9396
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 24 Nov 2020 16:17:16 -0500
parents d9a05b11904d
children 57183111a463
files Makefile contrib/packaging/Makefile contrib/packaging/docker/ubuntu.template contrib/packaging/dockerdeb
diffstat 4 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Nov 24 14:47:24 2020 -0500
+++ b/Makefile	Tue Nov 24 16:17:16 2020 -0500
@@ -205,6 +205,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 \
--- a/contrib/packaging/Makefile	Tue Nov 24 14:47:24 2020 -0500
+++ b/contrib/packaging/Makefile	Tue Nov 24 16:17:16 2020 -0500
@@ -9,7 +9,7 @@
   xenial \
   bionic \
   cosmic \
-  disco
+  focal
 
 FEDORA_RELEASE := 31
 
--- a/contrib/packaging/docker/ubuntu.template	Tue Nov 24 14:47:24 2020 -0500
+++ b/contrib/packaging/docker/ubuntu.template	Tue Nov 24 16:17:16 2020 -0500
@@ -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 \
--- a/contrib/packaging/dockerdeb	Tue Nov 24 14:47:24 2020 -0500
+++ b/contrib/packaging/dockerdeb	Tue Nov 24 16:17:16 2020 -0500
@@ -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