packaging: don't write files for templatized Dockerfiles

Now that Docker image building is implemented in Python and we
can perform template substitution in memory, we don't need to
write out produced Dockerfiles to disk.

Differential Revision: https://phab.mercurial-scm.org/D3760

.hgignore

@@ -1,70 +1,68 b''
 syntax: glob
 
 *.elc
 *.tmp
 *.orig
 *.rej
 *~
 *.mergebackup
 *.o
 *.so
 *.dll
 *.exe
 *.pyd
 *.pyc
 *.pyo
 *$py.class
 *.swp
 *.prof
 *.zip
 \#*\#
 .\#*
 tests/.coverage*
 tests/.testtimes*
 tests/.hypothesis
 tests/hypothesis-generated
 tests/annotated
 tests/exceptions
 tests/*.err
 tests/htmlcov
 build
 contrib/chg/chg
 contrib/hgsh/hgsh
 contrib/vagrant/.vagrant
-contrib/packaging/docker/debian-*
-contrib/packaging/docker/ubuntu-*
 dist
 packages
 doc/common.txt
 doc/*.[0-9]
 doc/*.[0-9].txt
 doc/*.[0-9].gendoc.txt
 doc/*.[0-9].{x,ht}ml
 MANIFEST
 MANIFEST.in
 patches
 mercurial/__modulepolicy__.py
 mercurial/__version__.py
 mercurial/hgpythonlib.h
 mercurial.egg-info
 .DS_Store
 tags
 cscope.*
 .idea/*
 .asv/*
 i18n/hg.pot
 locale/*/LC_MESSAGES/hg.mo
 hgext/__index__.py
 
 rust/target/
 
 # Generated wheels
 wheelhouse/
 
 syntax: regexp
 ^\.pc/
 ^\.(pydev)?project
 
 # hackable windows distribution additions
 ^hg-python
 ^hg.py$

contrib/packaging/Makefile

@@ -1,167 +1,161 b''
 $(eval HGROOT := $(shell cd ../..; pwd))
 
 help:
 	@echo 'Packaging Make Targets'
 	@echo ''
 	@echo 'docker-centos-{5, 6, 7}'
 	@echo '   Build an RPM for a specific CentOS version using Docker.'
 	@echo ''
 	@echo 'docker-debian-{jessie, stretch}'
 	@echo '   Build Debian packages specific to a Debian distro using Docker.'
 	@echo ''
 	@echo 'docker-fedora-{20, 21}'
 	@echo '   Build an RPM for a specific Fedora version using Docker.'
 	@echo ''
 	@echo 'docker-ubuntu-{trusty, xenial, artful, bionic}'
 	@echo '   Build Debian package specific to an Ubuntu distro using Docker.'
 	@echo ''
 	@echo 'docker-ubuntu-{trusty, xenial, artful, bionic}-ppa'
 	@echo '   Build a source-only Debian package specific to an Ubuntu distro'
 	@echo '   using Docker.'
 	@echo ''
 	@echo 'linux-wheels'
 	@echo '   Build Linux manylinux wheels using Docker.'
 	@echo ''
 	@echo 'linux-wheels-{x86_64, i686}'
 	@echo '   Build Linux manylinux wheels for a specific architecture using Docker'
 	@echo ''
 	@echo 'deb'
 	@echo '   Build a Debian package locally targeting the current system'
 	@echo ''
 	@echo 'ppa'
 	@echo '   Build a Debian source package locally targeting the current system'
 	@echo ''
 	@echo 'centos-{5, 6, 7}'
 	@echo '   Build an RPM for a specific CentOS version locally'
 	@echo ''
 	@echo 'fedora-{20, 21}'
 	@echo '   Build an RPM for a specific Fedora version locally'
 
 .PHONY: help
 
 .PHONY: deb
 deb:
 	./builddeb
 
 .PHONY: ppa
 ppa:
 	./builddeb --source-only
 
-docker/debian-%: docker/debian.template
-	sed "s/__CODENAME__/$*/" $< > $@
-
 .PHONY: docker-debian-jessie
-docker-debian-jessie: docker/debian-jessie
+docker-debian-jessie:
 	./dockerdeb debian jessie
 
 .PHONY: docker-debian-stretch
-docker-debian-stretch: docker/debian-stretch
+docker-debian-stretch:
 	./dockerdeb debian stretch
 
-docker/ubuntu-%: docker/ubuntu.template
-	sed "s/__CODENAME__/$*/" $< > $@
-
 .PHONY: docker-ubuntu-trusty
-docker-ubuntu-trusty: docker/ubuntu-trusty
+docker-ubuntu-trusty:
 	./dockerdeb ubuntu trusty
 
 .PHONY: docker-ubuntu-trusty-ppa
-docker-ubuntu-trusty-ppa: docker/ubuntu-trusty
+docker-ubuntu-trusty-ppa:
 	./dockerdeb ubuntu trusty --source-only
 
 .PHONY: docker-ubuntu-xenial
-docker-ubuntu-xenial: docker/ubuntu-xenial
+docker-ubuntu-xenial:
 	./dockerdeb ubuntu xenial
 
 .PHONY: docker-ubuntu-xenial-ppa
-docker-ubuntu-xenial-ppa: docker/ubuntu-xenial
+docker-ubuntu-xenial-ppa:
 	./dockerdeb ubuntu xenial --source-only
 
 .PHONY: docker-ubuntu-artful
-docker-ubuntu-artful: docker/ubuntu-artful
+docker-ubuntu-artful:
 	./dockerdeb ubuntu artful
 
 .PHONY: docker-ubuntu-artful-ppa
-docker-ubuntu-artful-ppa: docker/ubuntu-artful
+docker-ubuntu-artful-ppa:
 	./dockerdeb ubuntu artful --source-only
 
 .PHONY: docker-ubuntu-bionic
-docker-ubuntu-bionic: docker/ubuntu-bionic
+docker-ubuntu-bionic:
 	./dockerdeb ubuntu bionic
 
 .PHONY: docker-ubuntu-bionic-ppa
-docker-ubuntu-bionic-ppa: docker/ubuntu-bionic
+docker-ubuntu-bionic-ppa:
 	./dockerdeb ubuntu bionic --source-only
 
 .PHONY: fedora20
 fedora20:
 	mkdir -p $(HGROOT)/packages/fedora20
 	./buildrpm
 	cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/fedora20
 	cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/fedora20
 	rm -rf $(HGROOT)/rpmbuild
 
 .PHONY: docker-fedora20
 docker-fedora20:
 	mkdir -p $(HGROOT)/packages/fedora20
 	./dockerrpm fedora20
 
 .PHONY: fedora21
 fedora21:
 	mkdir -p $(HGROOT)/packages/fedora21
 	./buildrpm
 	cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/fedora21
 	cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/fedora21
 	rm -rf $(HGROOT)/rpmbuild
 
 .PHONY: docker-fedora21
 docker-fedora21:
 	mkdir -p $(HGROOT)packages/fedora21
 	./dockerrpm fedora21
 
 .PHONY: centos5
 centos5:
 	mkdir -p $(HGROOT)/packages/centos5
 	./buildrpm --withpython
 	cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/centos5
 	cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/centos5
 
 .PHONY: docker-centos5
 docker-centos5:
 	mkdir -p $(HGROOT)/packages/centos5
 	./dockerrpm centos5 --withpython
 
 .PHONY: centos6
 centos6:
 	mkdir -p $(HGROOT)/packages/centos6
 	./buildrpm --withpython
 	cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/centos6
 	cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/centos6
 
 .PHONY: docker-centos6
 docker-centos6:
 	mkdir -p $(HGROOT)/packages/centos6
 	./dockerrpm centos6 --withpython
 
 .PHONY: centos7
 centos7:
 	mkdir -p $(HGROOT)/packages/centos7
 	./buildrpm
 	cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/centos7
 	cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/centos7
 
 .PHONY: docker-centos7
 docker-centos7:
 	mkdir -p $(HGROOT)/packages/centos7
 	./dockerrpm centos7
 
 .PHONY: linux-wheels
 linux-wheels: linux-wheels-x86_64 linux-wheels-i686
 
 .PHONY: linux-wheels-x86_64
 linux-wheels-x86_64:
 	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_x86_64 /src/contrib/packaging/build-linux-wheels.sh
 
 .PHONY: linux-wheels-i686
 linux-wheels-i686:
 	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/packaging/build-linux-wheels.sh

contrib/packaging/docker/debian.template

@@ -1,16 +1,16 b''
-FROM debian:__CODENAME__
+FROM debian:%CODENAME%
 
 RUN groupadd -g 1000 build && \
     useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
 
 RUN apt-get update && apt-get install -y \
   build-essential \
   debhelper \
   devscripts \
   dh-python \
   less \
   python \
   python-all-dev \
   python-docutils \
   unzip \
   zip

contrib/packaging/docker/ubuntu.template

@@ -1,16 +1,16 b''
-FROM ubuntu:__CODENAME__
+FROM ubuntu:%CODENAME%
 
 RUN groupadd -g 1000 build && \
     useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
 
 RUN apt-get update && apt-get install -y \
   build-essential \
   debhelper \
   devscripts \
   dh-python \
   less \
   python \
   python-all-dev \
   python-docutils \
   unzip \
   zip

contrib/packaging/dockerdeb

@@ -1,37 +1,40 b''
 #!/bin/bash -eu
 
 . $(dirname $0)/packagelib.sh
 
 BUILDDIR=$(dirname $0)
 export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
 
 DISTID="$1"
 CODENAME="$2"
 PLATFORM="$1-$2"
 shift; shift # extra params are passed to build process
 
 OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
 CONTAINER=hg-docker-$PLATFORM
 
 DOCKER=$($BUILDDIR/hg-docker docker-path)
 
-$BUILDDIR/hg-docker build $BUILDDIR/docker/$PLATFORM $CONTAINER
+$BUILDDIR/hg-docker build \
+    --build-arg CODENAME=$CODENAME \
+    $BUILDDIR/docker/$DISTID.template \
+    $CONTAINER
 
 # 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
 # container and hope it's writable. Whee.
 dn=$(basename $ROOTDIR)
 
 DBUILDUSER=build
 
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean && make local"
 fi
 $DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \
   sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
 contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean"
 fi