Skip to content
Snippets Groups Projects
Commit 97142451 authored by Matt Harbison's avatar Matt Harbison
Browse files

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
parent d9a05b11
No related branches found
No related tags found
No related merge requests found
......@@ -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 \
......
......@@ -9,7 +9,7 @@
xenial \
bionic \
cosmic \
disco
focal
FEDORA_RELEASE := 31
......
......@@ -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 \
......
......@@ -12,7 +12,8 @@
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 \
......@@ -15,7 +16,8 @@
DOCKER=$($BUILDDIR/hg-docker docker-path)
$BUILDDIR/hg-docker build \
--build-arg TZ=$TZ \
--build-arg CODENAME=$CODENAME \
$BUILDDIR/docker/$DISTID.template \
$CONTAINER
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment