Mercurial > public > mercurial-scm > hg

diff contrib/packaging/dockerdeb @ 38459:c8ef9d897e14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 12 May 2018 14:41:48 -0700
parents e5916f1236f3
children 824636b08400
line wrap: on
line diff
--- a/contrib/packaging/dockerdeb	Sat May 12 17:03:47 2018 -0700
+++ b/contrib/packaging/dockerdeb	Sat May 12 14:41:48 2018 -0700
@@ -15,7 +15,10 @@
 
 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