Mercurial > public > mercurial-scm > hg
diff contrib/packaging/dockerdeb @ 38458:e5916f1236f3
packaging: replace dockerlib.sh with a Python script
I want to do some more advanced things with Docker in upcoming
commits. Trying to do that with shell scripts will be a bit too
painful for my liking. Implementing things in Python will be
vastly simpler in the long run.
This commit essentially ports dockerlib.sh to a Python script.
dockerdeb and dockerrpm have been ported to use the new hg-docker
script.
hg-docker requires Python 3. I've only tested on Python 3.5.
Unlike the local packaging scripts which may need to run on old
distros, the Docker packaging scripts don't have these constraints.
So I think it is acceptable to require Python 3.5.
As part of the transition, the Docker image tags changed slightly.
I don't think that's a big deal: the Docker image names are
effectively arbitrary and are a means to an end to achieve
running commands in Docker containers.
The code for resolving the Dockerfile content allows substituting
values passed as arguments. This will be used in a subsequent commit.
Differential Revision: https://phab.mercurial-scm.org/D3759
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 12 May 2018 17:03:47 -0700 |
parents | 11eda1f1b6e7 |
children | c8ef9d897e14 |
line wrap: on
line diff
--- a/contrib/packaging/dockerdeb Sat May 12 15:51:37 2018 -0700 +++ b/contrib/packaging/dockerdeb Sat May 12 17:03:47 2018 -0700 @@ -1,21 +1,21 @@ #!/bin/bash -eu -. $(dirname $0)/dockerlib.sh . $(dirname $0)/packagelib.sh BUILDDIR=$(dirname $0) export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd) -checkdocker - 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 -initcontainer $PLATFORM +DOCKER=$($BUILDDIR/hg-docker docker-path) + +$BUILDDIR/hg-docker build $BUILDDIR/docker/$PLATFORM $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