simplify docker commands

This commit is contained in:
Simon Martín
2018-05-03 11:18:09 +02:00
parent 6bb8c9c271
commit 066626d928
3 changed files with 2 additions and 8 deletions
+1 -1
View File
@@ -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"
-4
View File
@@ -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
+1 -3
View File
@@ -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",