contrib/packaging/dockerrpm
branchstable
changeset 48331 4713bcf78037
parent 43359 e66a3bfcb19b
equal deleted inserted replaced
48330:e35807332598 48331:4713bcf78037
    16 
    16 
    17 DOCKER=$($BUILDDIR/hg-docker docker-path)
    17 DOCKER=$($BUILDDIR/hg-docker docker-path)
    18 
    18 
    19 CONTAINER=hg-docker-$PLATFORM
    19 CONTAINER=hg-docker-$PLATFORM
    20 
    20 
    21 if [[ -z "${HG_DOCKER_OWN_USER}" ]]; then
    21 DOCKERUID=$(id -u)
    22     DOCKERUID=1000
    22 DOCKERGID=$(id -g)
    23     DOCKERGID=1000
       
    24 else
       
    25     DOCKERUID=$(id -u)
       
    26     DOCKERGID=$(id -g)
       
    27 fi
       
    28 
    23 
    29 $BUILDDIR/hg-docker build \
    24 $BUILDDIR/hg-docker build \
    30     --build-arg UID=$DOCKERUID \
    25     --build-arg UID=$DOCKERUID \
    31     --build-arg GID=$DOCKERGID \
    26     --build-arg GID=$DOCKERGID \
    32     --build-arg OS_RELEASE=${OS_RELEASE:-latest} \
    27     --build-arg OS_RELEASE=${OS_RELEASE:-latest} \