updated dockertests [skip ci]

node-cache · Sep 20, 2016 · 09e3b4a · 09e3b4a
1 parent ab14c47
commit 09e3b4a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/dockertests/Dockerfile_0_10 b/dockertests/Dockerfile_0_10
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/Dockerfile_0_12 b/dockertests/Dockerfile_0_12
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/Dockerfile_4_2 b/dockertests/Dockerfile_4_2
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/Dockerfile_5_0 b/dockertests/Dockerfile_5_0
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/Dockerfile_5_4 b/dockertests/Dockerfile_5_4
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/Dockerfile_latest b/dockertests/Dockerfile_latest
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/Dockerfile_lts b/dockertests/Dockerfile_lts
@@ -9,7 +9,7 @@ WORKDIR /usr/src/
 COPY package.json /usr/src/package.json
 
 RUN npm install --production
-RUN npm install -g expresso
+RUN npm install mocha should
 
 COPY lib/ /usr/src/lib/
 COPY test/ /usr/src/test/

diff --git a/dockertests/runtests.sh b/dockertests/runtests.sh
@@ -1,12 +1,10 @@
 VERSIONS[0]="0.10"
 VERSIONS[1]="0.12"
 VERSIONS[2]="4.2"
-# currently expresso is not working on node 5.x
-#VERSIONS[3]="5.0"
-#VERSIONS[4]="5.4"
+VERSIONS[3]="5.0"
+VERSIONS[4]="5.4"
 VERSIONS[5]="lts"
-# currently expresso is not working on node 5.x
-#VERSIONS[6]="latest"
+VERSIONS[6]="latest"
 
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -25,7 +23,7 @@ do
 	   BUILDLOGS="$DIR/dockerbuild_$version.log"
 	   rm -f $BUILDLOGS
 	   docker build -t=mpneuried.nodecache.test.$version -f=$SCRIPTDIR/$DFile . > $BUILDLOGS
-	   docker run mpneuried.nodecache.test.$version >&2
+	   docker run --rm mpneuried.nodecache.test.$version >&2
    else
 	   echo "Dockerfile '$DFile' not found"
    fi