From 9d6052295322d2dd43a1478e4ce096136ad4dc4f Mon Sep 17 00:00:00 2001 From: Robert Lowry Date: Thu, 26 Sep 2019 11:19:54 -0500 Subject: [PATCH] common/travis/docker.sh: add control variables for more flexible local testing using existing tools --- common/travis/docker.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/travis/docker.sh b/common/travis/docker.sh index 1784cd4a54e..ecd4a647218 100755 --- a/common/travis/docker.sh +++ b/common/travis/docker.sh @@ -4,10 +4,13 @@ [ "$XLINT" ] && exit 0 -/bin/echo -e "\x1b[32mPulling docker image for $BOOTSTRAP from $TAG...\x1b[0m" -docker pull voidlinux/masterdir-$BOOTSTRAP:$TAG +DOCKER_IMAGE_BASE=${DOCKER_IMAGE_BASE:-voidlinux/masterdir} +DOCKER_NAME=${DOCKER_NAME:-void} + +/bin/echo -e "\x1b[32mPulling docker image $DOCKER_IMAGE_BASE-$BOOTSTRAP:$TAG...\x1b[0m" +docker pull $DOCKER_IMAGE_BASE-$BOOTSTRAP:$TAG docker run -d \ - --name void \ + --name $DOCKER_NAME \ -v "$(pwd)":/hostrepo \ -v /tmp:/tmp \ -e XLINT="$XLINT" \