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

using docker tag postgis-2.4.4.5 in travis

Browse Source
This commit is contained in:
Simon Martín 2018-10-10 11:23:54 +02:00 committed by Rafa de la Torre
parent 2af6486f73
commit 945b151712
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -4,7 +4,7 @@ jobs:
services: services:
- docker - docker
language: generic language: generic
before_install: docker pull carto/nodejs6-xenial-pg101 before_install: docker pull carto/nodejs6-xenial-pg101:postgis-2.4.4.5
script: npm run docker-test script: npm run docker-test
- dist: precise - dist: precise
addons: addons:
@ -28,7 +28,7 @@ jobs:
- sudo add-apt-repository -y ppa:cartodb/gis-testing - sudo add-apt-repository -y ppa:cartodb/gis-testing
- sudo apt-get update - sudo apt-get update
# Force instalation of libgeos-3.5.0 (presumably needed because of existing version of postgis) # Force instalation of libgeos-3.5.0 (presumably needed because of existing version of postgis)
- sudo apt-get -y install libgeos-3.5.0=3.5.0-1cdb2 - sudo apt-get -y install libgeos-3.5.0=3.5.0-1cdb2
@ -59,9 +59,9 @@ jobs:
- createdb template_postgis - createdb template_postgis
- createuser publicuser - createuser publicuser
- psql -c "CREATE EXTENSION postgis" template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis
# install yarn 0.27.5 # install yarn 0.27.5
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5
- export PATH="$HOME/.yarn/bin:$PATH" - export PATH="$HOME/.yarn/bin:$PATH"
# instal redis 4 # instal redis 4

2
package.json
View File

@ -66,7 +66,7 @@
"preinstall": "make pre-install", "preinstall": "make pre-install",
"test": "make test-all", "test": "make test-all",
"update-internal-deps": "rm -rf node_modules && rm -f yarn.lock && yarn", "update-internal-deps": "rm -rf node_modules && rm -f yarn.lock && yarn",
"docker-test": "docker run -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v", "docker-test": "docker run -v `pwd`:/srv carto/nodejs6-xenial-pg101:postgis-2.4.4.5 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 carto/nodejs6-xenial-pg101 bash" "docker-bash": "docker run -it -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash"
}, },
"engines": { "engines": {