diff --git a/.travis.yml b/.travis.yml index 33d4ee99..40fbc6be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ jobs: - docker language: generic before_install: docker pull cartoimages/engine-xenial-pg101 - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh + script: npm run docker-test - dist: precise addons: postgresql: "9.5" diff --git a/docker/reference.md b/docker/reference.md index 9619ab88..2d22e858 100644 --- a/docker/reference.md +++ b/docker/reference.md @@ -17,7 +17,3 @@ After running the tests with docker, you will need Docker installed and the dock - `docker tag cartoimages/engine-xenial-pg101 cartoimages/engine-xenial-pg101` - Upload: - `docker push cartoimages/engine-xenial-pg101` - - -## Useful commands -We have some useful commands created in package.json diff --git a/package.json b/package.json index 69075adf..050998f1 100644 --- a/package.json +++ b/package.json @@ -65,10 +65,8 @@ "preinstall": "make pre-install", "test": "make test-all", "update-internal-deps": "rm -rf node_modules && rm -f yarn.lock && yarn", - "docker-pull": "docker pull cartoimages/engine-xenial-pg101", "docker-test": "docker run -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v", - "docker-bash": "docker run -it -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash", - "docker-build": "docker build -t cartoimages/engine-xenial-pg101 -f docker/Dockerfile-xenial-pg101 docker/" + "docker-bash": "docker run -it -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash" }, "engines": { "node": ">=6.9",