diff --git a/Makefile b/Makefile index d9a05b11904d22038a6094c1ccfcbfd49482ae27_TWFrZWZpbGU=..971424517e17cad2dc00fe140627a26ec3de49c2_TWFrZWZpbGU= 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile index d9a05b11904d22038a6094c1ccfcbfd49482ae27_Y29udHJpYi9wYWNrYWdpbmcvTWFrZWZpbGU=..971424517e17cad2dc00fe140627a26ec3de49c2_Y29udHJpYi9wYWNrYWdpbmcvTWFrZWZpbGU= 100644 --- a/contrib/packaging/Makefile +++ b/contrib/packaging/Makefile @@ -9,7 +9,7 @@ xenial \ bionic \ cosmic \ - disco + focal FEDORA_RELEASE := 31 diff --git a/contrib/packaging/docker/ubuntu.template b/contrib/packaging/docker/ubuntu.template index d9a05b11904d22038a6094c1ccfcbfd49482ae27_Y29udHJpYi9wYWNrYWdpbmcvZG9ja2VyL3VidW50dS50ZW1wbGF0ZQ==..971424517e17cad2dc00fe140627a26ec3de49c2_Y29udHJpYi9wYWNrYWdpbmcvZG9ja2VyL3VidW50dS50ZW1wbGF0ZQ== 100644 --- 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/dockerdeb b/contrib/packaging/dockerdeb index d9a05b11904d22038a6094c1ccfcbfd49482ae27_Y29udHJpYi9wYWNrYWdpbmcvZG9ja2VyZGVi..971424517e17cad2dc00fe140627a26ec3de49c2_Y29udHJpYi9wYWNrYWdpbmcvZG9ja2VyZGVi 100755 --- a/contrib/packaging/dockerdeb +++ b/contrib/packaging/dockerdeb @@ -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