cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into redis4

Browse Source
This commit is contained in:
Simon Martín 2018-01-16 15:10:08 +01:00
commit 479e8970a1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -5,10 +5,10 @@ services:
- docker - docker
before_install: before_install:
- docker pull cartoimages/windshaft-carto-testing - docker pull cartoimages/windshaft-testing
script: script:
- docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-carto-testing - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-testing bash docker-test.sh
language: generic language: generic

3
package.json
View File

@ -67,8 +67,7 @@
"docker-install": "sudo apt install docker.io && sudo usermod -aG docker $(whoami)", "docker-install": "sudo apt install docker.io && sudo usermod -aG docker $(whoami)",
"docker-pull": "docker pull cartoimages/windshaft-testing", "docker-pull": "docker pull cartoimages/windshaft-testing",
"docker-test": "docker run -v `pwd`:/srv cartoimages/windshaft-testing bash docker-test.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v", "docker-test": "docker run -v `pwd`:/srv cartoimages/windshaft-testing bash docker-test.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v",
"docker-bash": "docker run -it -v `pwd`:/srv cartoimages/windshaft-testing bash", "docker-bash": "docker run -it -v `pwd`:/srv cartoimages/windshaft-testing bash"
"docker-publish": "docker push cartoimages/windshaft-carto-testing"
}, },
"engines": { "engines": {
"node": ">=6.9", "node": ">=6.9",