chore: go back to compose run

makeomatic · Jan 11, 2016 · 0d25e60 · 0d25e60
1 parent a781949
commit 0d25e60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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,15 +33,15 @@ $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"
 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"