From 3edfcf2ed63d1ea4da06388f4cdeda3815ebf80c 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 --- .travis.yml | 1 + common/travis/docker.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0ffe216573..608eae6ea34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ git: env: global: - PATH=$PATH:/tmp/bin + - DOCKER_BASE=voidlinux/masterdir - TAG=2019042701 matrix: diff --git a/common/travis/docker.sh b/common/travis/docker.sh index 1784cd4a54e..9b98b42c016 100755 --- a/common/travis/docker.sh +++ b/common/travis/docker.sh @@ -4,13 +4,15 @@ [ "$XLINT" ] && exit 0 -/bin/echo -e "\x1b[32mPulling docker image for $BOOTSTRAP from $TAG...\x1b[0m" -docker pull voidlinux/masterdir-$BOOTSTRAP:$TAG +DOCKER_NAME=${DOCKER_NAME:-void} + +/bin/echo -e "\x1b[32mPulling docker image $DOCKER_BASE-$BOOTSTRAP:$TAG...\x1b[0m" +docker pull $DOCKER_BASE-$BOOTSTRAP:$TAG docker run -d \ - --name void \ + --name $DOCKER_NAME \ -v "$(pwd)":/hostrepo \ -v /tmp:/tmp \ -e XLINT="$XLINT" \ -e PATH="$PATH" \ - voidlinux/masterdir-$BOOTSTRAP:$TAG \ + $DOCKER_BASE-$BOOTSTRAP:$TAG \ /bin/sh -c 'sleep inf'