From 945b1517129b4552d353c143cfdc83847f2dd1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Wed, 10 Oct 2018 11:23:54 +0200 Subject: [PATCH] using docker tag postgis-2.4.4.5 in travis --- .travis.yml | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e0b1daa..1e0952d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jobs: services: - docker 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 - dist: precise addons: @@ -28,7 +28,7 @@ jobs: - sudo add-apt-repository -y ppa:cartodb/gis-testing - sudo apt-get update - + # 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 @@ -59,9 +59,9 @@ jobs: - createdb template_postgis - createuser publicuser - psql -c "CREATE EXTENSION postgis" template_postgis - + # 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" # instal redis 4 diff --git a/package.json b/package.json index d958b3bc..47f1c24e 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "preinstall": "make pre-install", "test": "make test-all", "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" }, "engines": {