This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9396

packaging: drop Disco (19.04) and add Focal (20.04)
ClosedPublic

Authored by mharbison72 on Nov 25 2020, 12:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG971424517e17: packaging: drop Disco (19.04) and add Focal (20.04)
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 25 2020, 12:14 AM
SimonSapin added a subscriber: SimonSapin.Nov 25 2020, 4:46 AM

I’ve run into this issue of tzdata prompting for user input in automation before, and worked around it by setting the DEBIAN_FRONTEND=noninteractive environment variable based on https://stackoverflow.com/questions/44331836/apt-get-install-tzdata-noninteractive. This might also help if an other system package starts prompting.

pulkit accepted this revision.Nov 29 2020, 1:13 PM
This revision is now accepted and ready to land.Nov 29 2020, 1:13 PM
mharbison72 added a commit: rHG971424517e17: packaging: drop Disco (19.04) and add Focal (20.04).Nov 29 2020, 1:40 PM
Closed by commit rHG971424517e17: packaging: drop Disco (19.04) and add Focal (20.04) (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23852

Makefile

docker-debian-bullseye \ docker-debian-bullseye \
docker-debian-buster \ docker-debian-buster \
docker-debian-stretch \ docker-debian-stretch \
docker-fedora \ docker-fedora \
docker-ubuntu-xenial \ docker-ubuntu-xenial \
docker-ubuntu-xenial-ppa \ docker-ubuntu-xenial-ppa \
docker-ubuntu-bionic \ docker-ubuntu-bionic \
docker-ubuntu-bionic-ppa \ docker-ubuntu-bionic-ppa \
docker-ubuntu-focal \
docker-ubuntu-focal-ppa \
fedora \ fedora \
linux-wheels \ linux-wheels \
linux-wheels-x86_64 \ linux-wheels-x86_64 \
linux-wheels-i686 \ linux-wheels-i686 \
ppa ppa
# Forward packaging targets for convenience. # Forward packaging targets for convenience.
$(packaging_targets): $(packaging_targets):

contrib/packaging/Makefile

$(eval HGROOT := $(shell cd ../..; pwd)) $(eval HGROOT := $(shell cd ../..; pwd))
DEBIAN_CODENAMES := \ DEBIAN_CODENAMES := \
stretch \ stretch \
buster \ buster \
bullseye bullseye
UBUNTU_CODENAMES := \ UBUNTU_CODENAMES := \
xenial \ xenial \
bionic \ bionic \
cosmic \ cosmic \
disco focal
FEDORA_RELEASE := 31 FEDORA_RELEASE := 31
CENTOS_RELEASES := \ CENTOS_RELEASES := \
7 \ 7 \
8 8
# Build a Python for these CentOS releases. # Build a Python for these CentOS releases.

contrib/packaging/docker/ubuntu.template

FROM ubuntu:%CODENAME% FROM ubuntu:%CODENAME%
RUN groupadd -g 1000 build && \ RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m 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 \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
debhelper \ debhelper \
devscripts \ devscripts \
dh-python \ dh-python \
less \ less \
python \ python \
python3-all \ python3-all \
python3-all-dev \ python3-all-dev \
python3-docutils \ python3-docutils \
unzip \ unzip \
zip zip

contrib/packaging/dockerdeb

#!/bin/bash -eu #!/bin/bash -eu
. $(dirname $0)/packagelib.sh . $(dirname $0)/packagelib.sh
BUILDDIR=$(dirname $0) BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd) export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
DISTID="$1" DISTID="$1"
CODENAME="$2" CODENAME="$2"
PLATFORM="$1-$2" PLATFORM="$1-$2"
shift; shift # extra params are passed to build process shift; shift # extra params are passed to build process
OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM} OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
CONTAINER=hg-docker-$PLATFORM CONTAINER=hg-docker-$PLATFORM
TZ=`ls -la /etc/localtime | cut -d/ -f7-9`
DOCKER=$($BUILDDIR/hg-docker docker-path) DOCKER=$($BUILDDIR/hg-docker docker-path)
$BUILDDIR/hg-docker build \ $BUILDDIR/hg-docker build \
--build-arg TZ=$TZ \
--build-arg CODENAME=$CODENAME \ --build-arg CODENAME=$CODENAME \
$BUILDDIR/docker/$DISTID.template \ $BUILDDIR/docker/$DISTID.template \
$CONTAINER $CONTAINER
# debuild only appears to be able to save built debs etc to .., so we # debuild only appears to be able to save built debs etc to .., so we
# have to share the .. of the current directory with the docker # have to share the .. of the current directory with the docker
# container and hope it's writable. Whee. # container and hope it's writable. Whee.
dn=$(basename $ROOTDIR) dn=$(basename $ROOTDIR)