This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3760

packaging: don't write files for templatized Dockerfiles
ClosedPublic

Authored by indygreg on Jun 16 2018, 2:19 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc8ef9d897e14: packaging: don't write files for templatized Dockerfiles
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jun 16 2018, 2:19 PM
durin42 accepted this revision.Jun 25 2018, 10:50 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:50 AM
Closed by commit rHGc8ef9d897e14: packaging: don't write files for templatized Dockerfiles (authored by indygreg). · Explain WhyJun 25 2018, 11:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9112

.hgignore

tests/annotated tests/annotated
tests/exceptions tests/exceptions
tests/*.err tests/*.err
tests/htmlcov tests/htmlcov
build build
contrib/chg/chg contrib/chg/chg
contrib/hgsh/hgsh contrib/hgsh/hgsh
contrib/vagrant/.vagrant contrib/vagrant/.vagrant
contrib/packaging/docker/debian-*
contrib/packaging/docker/ubuntu-*
dist dist
packages packages
doc/common.txt doc/common.txt
doc/*.[0-9] doc/*.[0-9]
doc/*.[0-9].txt doc/*.[0-9].txt
doc/*.[0-9].gendoc.txt doc/*.[0-9].gendoc.txt
doc/*.[0-9].{x,ht}ml doc/*.[0-9].{x,ht}ml
MANIFEST MANIFEST

contrib/packaging/Makefile

.PHONY: deb .PHONY: deb
deb: deb:
./builddeb ./builddeb
.PHONY: ppa .PHONY: ppa
ppa: ppa:
./builddeb --source-only ./builddeb --source-only
docker/debian-%: docker/debian.template
sed "s/__CODENAME__/$*/" $< > $@
.PHONY: docker-debian-jessie .PHONY: docker-debian-jessie
docker-debian-jessie: docker/debian-jessie docker-debian-jessie:
./dockerdeb debian jessie ./dockerdeb debian jessie
.PHONY: docker-debian-stretch .PHONY: docker-debian-stretch
docker-debian-stretch: docker/debian-stretch docker-debian-stretch:
./dockerdeb debian stretch ./dockerdeb debian stretch
docker/ubuntu-%: docker/ubuntu.template
sed "s/__CODENAME__/$*/" $< > $@
.PHONY: docker-ubuntu-trusty .PHONY: docker-ubuntu-trusty
docker-ubuntu-trusty: docker/ubuntu-trusty docker-ubuntu-trusty:
./dockerdeb ubuntu trusty ./dockerdeb ubuntu trusty
.PHONY: docker-ubuntu-trusty-ppa .PHONY: docker-ubuntu-trusty-ppa
docker-ubuntu-trusty-ppa: docker/ubuntu-trusty docker-ubuntu-trusty-ppa:
./dockerdeb ubuntu trusty --source-only ./dockerdeb ubuntu trusty --source-only
.PHONY: docker-ubuntu-xenial .PHONY: docker-ubuntu-xenial
docker-ubuntu-xenial: docker/ubuntu-xenial docker-ubuntu-xenial:
./dockerdeb ubuntu xenial ./dockerdeb ubuntu xenial
.PHONY: docker-ubuntu-xenial-ppa .PHONY: docker-ubuntu-xenial-ppa
docker-ubuntu-xenial-ppa: docker/ubuntu-xenial docker-ubuntu-xenial-ppa:
./dockerdeb ubuntu xenial --source-only ./dockerdeb ubuntu xenial --source-only
.PHONY: docker-ubuntu-artful .PHONY: docker-ubuntu-artful
docker-ubuntu-artful: docker/ubuntu-artful docker-ubuntu-artful:
./dockerdeb ubuntu artful ./dockerdeb ubuntu artful
.PHONY: docker-ubuntu-artful-ppa .PHONY: docker-ubuntu-artful-ppa
docker-ubuntu-artful-ppa: docker/ubuntu-artful docker-ubuntu-artful-ppa:
./dockerdeb ubuntu artful --source-only ./dockerdeb ubuntu artful --source-only
.PHONY: docker-ubuntu-bionic .PHONY: docker-ubuntu-bionic
docker-ubuntu-bionic: docker/ubuntu-bionic docker-ubuntu-bionic:
./dockerdeb ubuntu bionic ./dockerdeb ubuntu bionic
.PHONY: docker-ubuntu-bionic-ppa .PHONY: docker-ubuntu-bionic-ppa
docker-ubuntu-bionic-ppa: docker/ubuntu-bionic docker-ubuntu-bionic-ppa:
./dockerdeb ubuntu bionic --source-only ./dockerdeb ubuntu bionic --source-only
.PHONY: fedora20 .PHONY: fedora20
fedora20: fedora20:
mkdir -p $(HGROOT)/packages/fedora20 mkdir -p $(HGROOT)/packages/fedora20
./buildrpm ./buildrpm
cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/fedora20 cp $(HGROOT)/rpmbuild/RPMS/*/* $(HGROOT)/packages/fedora20
cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/fedora20 cp $(HGROOT)/rpmbuild/SRPMS/* $(HGROOT)/packages/fedora20

contrib/packaging/docker/debian.template

FROM debian:__CODENAME__ FROM debian:%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
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 \
python-all-dev \ python-all-dev \
python-docutils \ python-docutils \
unzip \ unzip \
zip zip

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
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 \
python-all-dev \ python-all-dev \
python-docutils \ python-docutils \
unzip \ unzip \
zip zip

contrib/packaging/dockerdeb

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
DOCKER=$($BUILDDIR/hg-docker docker-path) 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 # 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)
DBUILDUSER=build DBUILDUSER=build