Skip to content

Commit 717428f

Browse files
committed
make dind image configurable
1 parent 85b63c6 commit 717428f

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

tests/config.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ TEST_TAG='test'
44
TEST_CONTAINER="${TEST_IMAGE}:${TEST_TAG}"
55
MARIADB_IMAGE='mariadb'
66
MARIADB_TAG='latest'
7+
DIND_IMAGE='jpetazzo/dind'
8+
DIND_TAG='latest'

tests/dind-runner.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ set -e
44

55
[ "$DEBUG" == 'true' ] && set -x
66

7+
CWD="$(dirname $0)/"
8+
9+
. ${CWD}functions.sh
10+
711
TEST_CONTAINER="dind-runner-$$"
812
DOCKERFILE="Dockerfile.test"
913

1014
echo ">> Using Temp Dockerfile: $DOCKERFILE"
1115

1216
cat << EOF > $DOCKERFILE
13-
FROM jpetazzo/dind:latest
17+
FROM ${DIND_IMAGE}:${DIND_TAG}
1418
ADD . /build/
1519
WORKDIR /build
1620
CMD ["/build/tests/runner.sh"]

0 commit comments

Comments
 (0)