Mercurial > hg
diff contrib/packaging/dockerrpm @ 43359:e66a3bfcb19b stable
packaging: make dockerrpm fedora target more generic
Fedora moves fast in version numbers, and often with Mercurial packaging being
backwards compatible. Thus, only aim for providing built-in support for latest
Fedora version, and make it easy to update.
With this refactoring, 'dockerrpm fedora31' also works.
'dockerrpm fedora' will use the 'fedora:latest' Docker image.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 01 Nov 2019 15:29:14 +0100 |
parents | 433cdcb37321 |
children | 4713bcf78037 |
line wrap: on
line diff
--- a/contrib/packaging/dockerrpm Fri Nov 01 12:59:22 2019 +0100 +++ b/contrib/packaging/dockerrpm Fri Nov 01 15:29:14 2019 +0100 @@ -6,6 +6,14 @@ PLATFORM="$1" shift # extra params are passed to buildrpm +DOCKERFILE="$PLATFORM" +OS_RELEASE="${PLATFORM//[a-z]/}" +case "$PLATFORM" in +fedora*) + DOCKERFILE="${PLATFORM//[0-9]/}.template" + ;; +esac + DOCKER=$($BUILDDIR/hg-docker docker-path) CONTAINER=hg-docker-$PLATFORM @@ -18,7 +26,11 @@ DOCKERGID=$(id -g) fi -$BUILDDIR/hg-docker build --build-arg UID=$DOCKERUID --build-arg GID=$DOCKERGID $BUILDDIR/docker/$PLATFORM $CONTAINER +$BUILDDIR/hg-docker build \ + --build-arg UID=$DOCKERUID \ + --build-arg GID=$DOCKERGID \ + --build-arg OS_RELEASE=${OS_RELEASE:-latest} \ + $BUILDDIR/docker/$DOCKERFILE $CONTAINER RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM mkdir -p $RPMBUILDDIR