diff --git a/test/docker-compose.yml b/test/docker-compose.yml index dd71826f..8c0b01d2 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -54,8 +54,7 @@ tester: - ${PWD}:/src container_name: tester environment: - BABEL_CACHE_PATH: "/src/.babel" NODE_ENV: "development" SKIP_REBUILD: ${SKIP_REBUILD} DEBUG: ${DEBUG} - command: 'tail -f /dev/null' + command: true diff --git a/test/docker.sh b/test/docker.sh index 30cf3425..db824b04 100755 --- a/test/docker.sh +++ b/test/docker.sh @@ -1,7 +1,7 @@ #!/bin/bash export NODE_ENV=development -BIN=./node_modules/.bin +BIN=node_modules/.bin DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DC="$DIR/docker-compose.yml" PATH=$PATH:$DIR/.bin/ @@ -33,7 +33,7 @@ $COMPOSE -f $DC up -d if [[ "$SKIP_REBUILD" != "1" ]]; then echo "rebuilding native dependencies..." - docker exec -it tester npm rebuild + $COMPOSE -f $DC run --rm tester npm rebuild fi echo "cleaning old coverage" @@ -41,7 +41,7 @@ rm -rf ./coverage echo "running tests" for fn in $TESTS; do - docker exec -it tester /bin/sh -c "$NODE $COVER --dir ./coverage/${fn##*/} $MOCHA -- $fn" || exit 1 + $COMPOSE -f $DC run --rm tester /bin/sh -c "$NODE $COVER --dir ./coverage/${fn##*/} $MOCHA -- $fn" || exit 1 done echo "started generating combined coverage"