From 55d2dcca049116c69dfbcc36b9b18aa210ec152c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 23 Apr 2018 15:26:42 +0200 Subject: [PATCH 01/35] adding first version of docker images --- docker/Dockerfile-xenial-pg101 | 76 +++++++++++++++++++++++++++++++ docker/Dockerfile-xenial-pg95 | 83 ++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 docker/Dockerfile-xenial-pg101 create mode 100644 docker/Dockerfile-xenial-pg95 diff --git a/docker/Dockerfile-xenial-pg101 b/docker/Dockerfile-xenial-pg101 new file mode 100644 index 00000000..206ad4f2 --- /dev/null +++ b/docker/Dockerfile-xenial-pg101 @@ -0,0 +1,76 @@ +FROM ubuntu:xenial + +# Use UTF8 to avoid encoding problems with pgsql +ENV LANG C.UTF-8 + +# Add external repos +RUN set -ex \ + && apt-get update \ + && apt-get install -y \ + curl \ + software-properties-common \ + locales \ + && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + && add-apt-repository -y ppa:cartodb/postgresql-10 \ + && add-apt-repository -y ppa:cartodb/gis \ + && curl -sL https://deb.nodesource.com/setup_6.x | bash \ + && locale-gen en_US.UTF-8 \ + && update-locale LANG=en_US.UTF-8 + +# Install dependencies and PostGIS 2.4 from sources +RUN set -ex \ + && apt-get update \ + && apt-get install -y \ + g++-4.9 \ + gcc-4.9 \ + git \ + libcairo2-dev \ + libgdal-dev \ + libgdal1i \ + libgdal20=2.2.2+dfsg-1~xenial1 \ + libgeos-dev \ + libgif-dev \ + libjpeg8-dev \ + libjson-c-dev \ + libpango1.0-dev \ + libpixman-1-dev \ + libproj-dev \ + libprotobuf-c-dev \ + libxml2-dev \ + make \ + nodejs \ + protobuf-c-compiler \ + pkg-config \ + wget \ + postgresql-10=10.1.2+carto-1 \ + postgresql-10-plproxy=2.8-1.pgdg16.04+1carto1 \ + postgresql-10-postgis-2.4=2.4.1.6+carto-1 \ + postgresql-10-postgis-2.4-scripts=2.4.1.6+carto-1 \ + postgresql-10-postgis-scripts=2.4.1.6+carto-1 \ + postgresql-client-10=10.1.2+carto-1 \ + postgresql-client-common=187.pgdg16.04+1carto1 \ + postgresql-common=187.pgdg16.04+1carto1 \ + postgresql-contrib=10+187.pgdg16.04+1carto1 \ + postgresql-plpython-10=10.1.2+carto-1 \ + postgresql-server-dev-10=10.1.2+carto-1 \ + postgis=2.4.1.6+carto-1 \ + && wget http://download.redis.io/releases/redis-4.0.8.tar.gz \ + && tar xvzf redis-4.0.8.tar.gz \ + && cd redis-4.0.8 \ + && make \ + && make install \ + && cd .. \ + && rm redis-4.0.8.tar.gz \ + && rm -R redis-4.0.8 \ + && apt-get purge -y wget protobuf-c-compiler \ + && apt-get autoremove -y + +# Configure PostgreSQL +RUN set -ex \ + && echo "listen_addresses='*'" >> /etc/postgresql/10/main/postgresql.conf \ + && echo "local all all trust" > /etc/postgresql/10/main/pg_hba.conf \ + && echo "host all all 0.0.0.0/0 trust" >> /etc/postgresql/10/main/pg_hba.conf \ + && echo "host all all ::1/128 trust" >> /etc/postgresql/10/main/pg_hba.conf + +WORKDIR /srv +EXPOSE 5858 diff --git a/docker/Dockerfile-xenial-pg95 b/docker/Dockerfile-xenial-pg95 new file mode 100644 index 00000000..bd5bbba7 --- /dev/null +++ b/docker/Dockerfile-xenial-pg95 @@ -0,0 +1,83 @@ +FROM ubuntu:xenial + +# Use UTF8 to avoid encoding problems with pgsql +ENV LANG C.UTF-8 + +# Add external repos +RUN set -ex \ + && apt-get update \ + && apt-get install -y \ + curl \ + software-properties-common \ + locales \ + && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ + && curl -sL https://deb.nodesource.com/setup_6.x | bash \ + && locale-gen en_US.UTF-8 \ + && update-locale LANG=en_US.UTF-8 + +# Install dependencies and PostGIS 2.4 from sources +RUN set -ex \ + && apt-get update \ + && apt-get install -y \ + g++-4.9 \ + gcc-4.9 \ + git \ + libcairo2-dev \ + libgdal-dev \ + libgdal1i \ + libgeos-dev \ + libgif-dev \ + libjpeg8-dev \ + libjson-c-dev \ + libpango1.0-dev \ + libpixman-1-dev \ + libproj-dev \ + libprotobuf-c-dev \ + libxml2-dev \ + make \ + nodejs \ + pkg-config \ + postgresql-9.5 \ + postgresql-plpython-9.5 \ + postgresql-server-dev-9.5 \ + protobuf-c-compiler \ + redis-server \ + wget \ + && wget http://download.osgeo.org/postgis/source/postgis-2.4.0.tar.gz \ + && tar xvfz postgis-2.4.0.tar.gz \ + && cd postgis-2.4.0 \ + && ./configure \ + && make \ + && make install \ + && cd .. \ + && rm -rf postgis-2.4.0 \ + && wget http://download.redis.io/releases/redis-4.0.8.tar.gz \ + && tar xvzf redis-4.0.8.tar.gz \ + && cd redis-4.0.8 \ + && make \ + && make install \ + && cd .. \ + && rm redis-4.0.8.tar.gz \ + && rm -R redis-4.0.8 \ + && apt-get purge -y wget protobuf-c-compiler \ + && apt-get autoremove -y + +# Configure PostgreSQL +RUN set -ex \ + && echo "listen_addresses='*'" >> /etc/postgresql/9.5/main/postgresql.conf \ + && echo "local all all trust" > /etc/postgresql/9.5/main/pg_hba.conf \ + && echo "host all all 0.0.0.0/0 trust" >> /etc/postgresql/9.5/main/pg_hba.conf \ + && echo "host all all ::1/128 trust" >> /etc/postgresql/9.5/main/pg_hba.conf + +WORKDIR /srv +EXPOSE 5858 + +CMD set -ex \ + && /etc/init.d/postgresql start \ + && node -v \ + && export NPROCS=1 \ + && export JOBS=1 \ + && export CXX=g++-4.9 \ + && npm install \ + && export PGUSER=postgres \ + && npm test From d8c356e350fc14db19cbe6c97c80398f92ea12d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 23 Apr 2018 15:39:01 +0200 Subject: [PATCH 02/35] changing name of docker sh to run_tests_docker --- .travis.yml | 5 ++--- docker-test.sh => run_tests_docker.sh | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename docker-test.sh => run_tests_docker.sh (100%) diff --git a/.travis.yml b/.travis.yml index fefef779..32f7d1d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: trusty +dist: xenial services: - docker @@ -8,7 +8,6 @@ before_install: - docker pull cartoimages/windshaft-testing script: - - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-testing bash docker-test.sh + - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-testing bash run_tests_docker.sh language: generic - diff --git a/docker-test.sh b/run_tests_docker.sh similarity index 100% rename from docker-test.sh rename to run_tests_docker.sh From d629dc24ae77c75b13ac6b4297c80cf54e34861a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 23 Apr 2018 15:40:16 +0200 Subject: [PATCH 03/35] removing default commands from image --- docker/Dockerfile-xenial-pg95 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docker/Dockerfile-xenial-pg95 b/docker/Dockerfile-xenial-pg95 index bd5bbba7..c8c8d6d8 100644 --- a/docker/Dockerfile-xenial-pg95 +++ b/docker/Dockerfile-xenial-pg95 @@ -71,13 +71,3 @@ RUN set -ex \ WORKDIR /srv EXPOSE 5858 - -CMD set -ex \ - && /etc/init.d/postgresql start \ - && node -v \ - && export NPROCS=1 \ - && export JOBS=1 \ - && export CXX=g++-4.9 \ - && npm install \ - && export PGUSER=postgres \ - && npm test From aeaf325e2a9aa21cfc06e04e9b2686f3348920f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 23 Apr 2018 16:00:46 +0200 Subject: [PATCH 04/35] travis tests with both images --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 32f7d1d1..19b365c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_install: - docker pull cartoimages/windshaft-testing script: - - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/windshaft-testing bash run_tests_docker.sh + - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh + - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh language: generic From d3615e8d2b79019d93e9c73909f0ed03c308dc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 23 Apr 2018 16:18:22 +0200 Subject: [PATCH 05/35] pull images before run tests --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19b365c1..cbbd1026 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ services: - docker before_install: - - docker pull cartoimages/windshaft-testing + - docker pull cartoimages/engine-xenial-pg101 + - docker pull cartoimages/engine-xenial-pg95 script: - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh From 09d937f5334c4ed8ec1344b4050f5eae91e0a1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 17:41:29 +0200 Subject: [PATCH 06/35] travis build stages --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbbd1026..2ec10497 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,11 @@ before_install: - docker pull cartoimages/engine-xenial-pg101 - docker pull cartoimages/engine-xenial-pg95 -script: - - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh - - docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh +jobs: + include: + - stage: xenial and Postgres 10.1 + script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh + - stage: xenial and Postgres 9.5 + script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh language: generic From db4c3b70bb3cb3a2bf2a67b2bbb0f36c13d93664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 17:49:38 +0200 Subject: [PATCH 07/35] travis build stages 2 --- .travis.yml | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ec10497..d000c729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,27 @@ -sudo: required -dist: xenial - -services: - - docker - -before_install: - - docker pull cartoimages/engine-xenial-pg101 - - docker pull cartoimages/engine-xenial-pg95 - jobs: include: - stage: xenial and Postgres 10.1 - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh - - stage: xenial and Postgres 9.5 - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh + sudo: required + dist: xenial + language: generic -language: generic + services: + - docker + + 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 + + - stage: xenial and Postgres 9.5 + sudo: required + dist: xenial + language: generic + + services: + - docker + + before_install: + - docker pull cartoimages/engine-xenial-pg95 + + script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh From 78326629f3b5e750206cac8e1a45398f5d507fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 18:00:17 +0200 Subject: [PATCH 08/35] trying travis tests in parallel --- .travis.yml | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index d000c729..fdb87626 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,11 @@ -jobs: - include: - - stage: xenial and Postgres 10.1 - sudo: required - dist: xenial - language: generic +sudo: required - services: - - docker +services: + - docker - before_install: - - docker pull cartoimages/engine-xenial-pg101 +before_install: + - docker pull cartoimages/engine-xenial-pg101 + - docker pull cartoimages/engine-xenial-pg95 - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh - - - stage: xenial and Postgres 9.5 - sudo: required - dist: xenial - language: generic - - services: - - docker - - before_install: - - docker pull cartoimages/engine-xenial-pg95 - - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh +script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh +script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh From 9437b35c8cb58ef733d15ed4b66168b79262cf7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 18:02:59 +0200 Subject: [PATCH 09/35] travis in paralell 2 --- .travis.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdb87626..540a458e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,15 @@ -sudo: required +jobs: + include: + - stage: Xenial and Postgres -services: - - docker + sudo: required -before_install: - - docker pull cartoimages/engine-xenial-pg101 - - docker pull cartoimages/engine-xenial-pg95 + services: + - docker -script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh -script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh + before_install: + - docker pull cartoimages/engine-xenial-pg101 + - docker pull cartoimages/engine-xenial-pg95 + + script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh + script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh From 7fdee0ebe53a574080863c1562fa718739691f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 18:07:31 +0200 Subject: [PATCH 10/35] travis in parallel --- .travis.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 540a458e..7b979376 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,13 @@ +sudo: required + +services: + - docker + +before_install: + - docker pull cartoimages/engine-xenial-pg101 + - docker pull cartoimages/engine-xenial-pg95 + jobs: include: - - stage: Xenial and Postgres - - sudo: required - - services: - - docker - - before_install: - - docker pull cartoimages/engine-xenial-pg101 - - docker pull cartoimages/engine-xenial-pg95 - - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh + - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh + - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh From 73d7ee37f8d2f00c8d557c2b852286e3699e7c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 24 Apr 2018 18:15:10 +0200 Subject: [PATCH 11/35] travis in parallel 4 --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b979376..30a37fb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,9 @@ sudo: required services: - docker -before_install: - - docker pull cartoimages/engine-xenial-pg101 - - docker pull cartoimages/engine-xenial-pg95 - jobs: include: - - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh - - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh + - 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 + - before_install: docker pull cartoimages/engine-xenial-pg95 + script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh From 12da3a58fc2f19e7b1ad2ffe3ab4df898695627c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 26 Apr 2018 13:12:25 +0200 Subject: [PATCH 12/35] postgres 10 working with maps and sql --- docker/Dockerfile-xenial-pg101 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile-xenial-pg101 b/docker/Dockerfile-xenial-pg101 index 206ad4f2..2aa9175e 100644 --- a/docker/Dockerfile-xenial-pg101 +++ b/docker/Dockerfile-xenial-pg101 @@ -27,7 +27,7 @@ RUN set -ex \ libcairo2-dev \ libgdal-dev \ libgdal1i \ - libgdal20=2.2.2+dfsg-1~xenial1 \ + libgdal20 \ libgeos-dev \ libgif-dev \ libjpeg8-dev \ @@ -37,23 +37,25 @@ RUN set -ex \ libproj-dev \ libprotobuf-c-dev \ libxml2-dev \ + gdal-bin \ make \ nodejs \ protobuf-c-compiler \ pkg-config \ wget \ - postgresql-10=10.1.2+carto-1 \ - postgresql-10-plproxy=2.8-1.pgdg16.04+1carto1 \ - postgresql-10-postgis-2.4=2.4.1.6+carto-1 \ - postgresql-10-postgis-2.4-scripts=2.4.1.6+carto-1 \ - postgresql-10-postgis-scripts=2.4.1.6+carto-1 \ - postgresql-client-10=10.1.2+carto-1 \ - postgresql-client-common=187.pgdg16.04+1carto1 \ - postgresql-common=187.pgdg16.04+1carto1 \ - postgresql-contrib=10+187.pgdg16.04+1carto1 \ - postgresql-plpython-10=10.1.2+carto-1 \ - postgresql-server-dev-10=10.1.2+carto-1 \ - postgis=2.4.1.6+carto-1 \ + zip \ + postgresql-10 \ + postgresql-10-plproxy \ + postgresql-10-postgis-2.4 \ + postgresql-10-postgis-2.4-scripts \ + postgresql-10-postgis-scripts \ + postgresql-client-10 \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython-10 \ + postgresql-server-dev-10 \ + postgis \ && wget http://download.redis.io/releases/redis-4.0.8.tar.gz \ && tar xvzf redis-4.0.8.tar.gz \ && cd redis-4.0.8 \ From f8b347a03ade5225184b26cb8af0242f6da485eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 26 Apr 2018 16:31:32 +0200 Subject: [PATCH 13/35] postgres 9.5 without docker in travis --- .travis.yml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30a37fb2..ca8d9493 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,68 @@ jobs: include: - 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 - - before_install: docker pull cartoimages/engine-xenial-pg95 - script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg95 bash run_tests_docker.sh + - dist: precise + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + postgresql: 9.5 + + before_install: + # Add custom PPAs from cartodb + - sudo add-apt-repository -y ppa:cartodb/postgresql-9.5 + - sudo add-apt-repository -y ppa:cartodb/gis + - 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 + + # Install postgres db and build deps + - sudo /etc/init.d/postgresql stop # stop travis default instance + - sudo apt-get -y remove --purge postgresql-9.1 + - sudo apt-get -y remove --purge postgresql-9.2 + - sudo apt-get -y remove --purge postgresql-9.3 + - sudo apt-get -y remove --purge postgresql-9.4 + - sudo apt-get -y remove --purge postgresql-9.5 + - sudo apt-get -y remove --purge postgresql-9.6 + - sudo rm -rf /var/lib/postgresql/ + - sudo rm -rf /var/log/postgresql/ + - sudo rm -rf /etc/postgresql/ + - sudo apt-get -y remove --purge postgis-2.2 + - sudo apt-get -y autoremove + + - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2 + - sudo apt-get -y install postgresql-9.5=9.5.2-3cdb3 --allow-downgrades + - sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-3cdb3 + - sudo apt-get -y install postgresql-plpython-9.5=9.5.2-3cdb3 --allow-downgrades + - sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2 + - sudo apt-get install -q gdal-bin + - sudo apt-get install -q ogr2ogr2-static-bin + - sudo apt-get install -y libc6 + + - wget http://download.redis.io/releases/redis-4.0.8.tar.gz + - tar xvzf redis-4.0.8.tar.gz + - cd redis-4.0.8 + - make + - sudo make install + - cd .. + - rm redis-4.0.8.tar.gz + + # configure it to accept local connections from postgres + - echo -e "# TYPE DATABASE USER ADDRESS METHOD \nlocal all postgres trust\nlocal all all trust\nhost all all 127.0.0.1/32 trust" \ + | sudo tee /etc/postgresql/9.5/main/pg_hba.conf + - sudo /etc/init.d/postgresql restart 9.5 + + - psql -c 'create database template_postgis;' -U postgres + - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis + - ./configure + + env: + - PGUSER=postgres CXX=g++-4.8 + + language: node_js + node_js: + - "6" From b16e2cad19130ea357a0ced7f6cf6fab1881d179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 26 Apr 2018 16:57:14 +0200 Subject: [PATCH 14/35] install yarn in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ca8d9493..e8002f41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,6 +64,7 @@ jobs: - psql -c 'create database template_postgis;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis + - npm install -g yarn@0.27.5 - ./configure env: From 47b029a8715581dee59d6420e9c2048f0e877539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 26 Apr 2018 17:00:37 +0200 Subject: [PATCH 15/35] updating g++ in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8002f41..f9bfd71d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ jobs: sources: - ubuntu-toolchain-r-test packages: - - g++-4.8 + - g++-4.9 postgresql: 9.5 before_install: @@ -68,7 +68,7 @@ jobs: - ./configure env: - - PGUSER=postgres CXX=g++-4.8 + - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9 language: node_js node_js: From 87f30a3633974675bc3c67e052f5270ff2e64b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 26 Apr 2018 17:10:40 +0200 Subject: [PATCH 16/35] installing yarn in travis 2 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9bfd71d..323bcdd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,8 @@ jobs: - psql -c 'create database template_postgis;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis - - npm install -g yarn@0.27.5 + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 + - export PATH="$HOME/.yarn/bin:$PATH" - ./configure env: From f880e86cd19b7df8112502ac1f18f6a4c145ae4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 10:20:55 +0200 Subject: [PATCH 17/35] removing configure in travis --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 323bcdd3..bc8640bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ sudo: required -services: - - docker - jobs: include: - - before_install: docker pull cartoimages/engine-xenial-pg101 + - services: + - docker + 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 - dist: precise addons: @@ -63,10 +62,10 @@ jobs: - sudo /etc/init.d/postgresql restart 9.5 - psql -c 'create database template_postgis;' -U postgres + - psql -c 'createuser publicuser' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - export PATH="$HOME/.yarn/bin:$PATH" - - ./configure env: - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9 From 82189d35e06c3988c362a8c638a69089ffbcec88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 10:28:04 +0200 Subject: [PATCH 18/35] removing create publu user --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc8640bb..cae7a2e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ jobs: include: - services: - 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 - dist: precise @@ -62,7 +63,6 @@ jobs: - sudo /etc/init.d/postgresql restart 9.5 - psql -c 'create database template_postgis;' -U postgres - - psql -c 'createuser publicuser' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - export PATH="$HOME/.yarn/bin:$PATH" From 85eb82a175fcca72714fa3171f1ceeec70ab85a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 10:37:32 +0200 Subject: [PATCH 19/35] gcc in travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cae7a2e2..d8cbe395 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ jobs: - ubuntu-toolchain-r-test packages: - g++-4.9 + - gcc-4.9 postgresql: 9.5 before_install: @@ -68,7 +69,7 @@ jobs: - export PATH="$HOME/.yarn/bin:$PATH" env: - - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9 + - NPROCS=1 JOBS=1 PGUSER=postgres CC=gcc-4.9 CXX=g++-4.9 language: node_js node_js: From bbbd7ab41cab6af015b5907651dc26262b1722e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 10:47:39 +0200 Subject: [PATCH 20/35] forcing yarn install with env params --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d8cbe395..723c161e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,7 @@ jobs: - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - export PATH="$HOME/.yarn/bin:$PATH" + - CC=gcc-4.9 CXX=g++-4.9 yarn env: - NPROCS=1 JOBS=1 PGUSER=postgres CC=gcc-4.9 CXX=g++-4.9 From 390a2b573f27736b3be56f7285ccf3e597ec991c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 10:57:47 +0200 Subject: [PATCH 21/35] test last travis configuration previous to docker --- .travis.yml | 71 +++++++++++------------------------------------------ 1 file changed, 15 insertions(+), 56 deletions(-) diff --git a/.travis.yml b/.travis.yml index 723c161e..5cc487d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,70 +7,29 @@ jobs: 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 - - dist: precise + - dist: trusty addons: + postgresql: "9.5" apt: sources: - - ubuntu-toolchain-r-test + - ubuntu-toolchain-r-test packages: - - g++-4.9 - - gcc-4.9 - postgresql: 9.5 + - postgresql-9.5-postgis-2.3 + - postgresql-plpython-9.5 + - pkg-config + - libcairo2-dev + - libjpeg8-dev + - libgif-dev + - libpango1.0-dev + - g++-4.9 before_install: - # Add custom PPAs from cartodb - - sudo add-apt-repository -y ppa:cartodb/postgresql-9.5 - - sudo add-apt-repository -y ppa:cartodb/gis - - 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 - - # Install postgres db and build deps - - sudo /etc/init.d/postgresql stop # stop travis default instance - - sudo apt-get -y remove --purge postgresql-9.1 - - sudo apt-get -y remove --purge postgresql-9.2 - - sudo apt-get -y remove --purge postgresql-9.3 - - sudo apt-get -y remove --purge postgresql-9.4 - - sudo apt-get -y remove --purge postgresql-9.5 - - sudo apt-get -y remove --purge postgresql-9.6 - - sudo rm -rf /var/lib/postgresql/ - - sudo rm -rf /var/log/postgresql/ - - sudo rm -rf /etc/postgresql/ - - sudo apt-get -y remove --purge postgis-2.2 - - sudo apt-get -y autoremove - - - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2 - - sudo apt-get -y install postgresql-9.5=9.5.2-3cdb3 --allow-downgrades - - sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-3cdb3 - - sudo apt-get -y install postgresql-plpython-9.5=9.5.2-3cdb3 --allow-downgrades - - sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2 - - sudo apt-get install -q gdal-bin - - sudo apt-get install -q ogr2ogr2-static-bin - - sudo apt-get install -y libc6 - - - wget http://download.redis.io/releases/redis-4.0.8.tar.gz - - tar xvzf redis-4.0.8.tar.gz - - cd redis-4.0.8 - - make - - sudo make install - - cd .. - - rm redis-4.0.8.tar.gz - - # configure it to accept local connections from postgres - - echo -e "# TYPE DATABASE USER ADDRESS METHOD \nlocal all postgres trust\nlocal all all trust\nhost all all 127.0.0.1/32 trust" \ - | sudo tee /etc/postgresql/9.5/main/pg_hba.conf - - sudo /etc/init.d/postgresql restart 9.5 - - - psql -c 'create database template_postgis;' -U postgres - - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - - export PATH="$HOME/.yarn/bin:$PATH" - - CC=gcc-4.9 CXX=g++-4.9 yarn + - createdb template_postgis + - createuser publicuser + - psql -c "CREATE EXTENSION postgis" template_postgis env: - - NPROCS=1 JOBS=1 PGUSER=postgres CC=gcc-4.9 CXX=g++-4.9 + - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9 language: node_js node_js: From 62bdbed1d5c21508b881363bd1d32d634736c5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 11:07:20 +0200 Subject: [PATCH 22/35] setting yarn version in previous travis version --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5cc487d3..38b9956c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,8 @@ jobs: - createdb template_postgis - createuser publicuser - psql -c "CREATE EXTENSION postgis" template_postgis + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 + - export PATH="$HOME/.yarn/bin:$PATH" env: - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9 From d83679c89546faeed30e947eb3a4f3bfa32e4ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 11:39:30 +0200 Subject: [PATCH 23/35] ensuring postgres version --- .travis.yml | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38b9956c..ae9012c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,13 @@ jobs: 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 - - dist: trusty + - dist: precise addons: postgresql: "9.5" apt: sources: - ubuntu-toolchain-r-test packages: - - postgresql-9.5-postgis-2.3 - - postgresql-plpython-9.5 - pkg-config - libcairo2-dev - libjpeg8-dev @@ -24,9 +22,45 @@ jobs: - g++-4.9 before_install: + # Add custom PPAs from cartodb + - sudo add-apt-repository -y ppa:cartodb/postgresql-9.5 + - sudo add-apt-repository -y ppa:cartodb/gis + - 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 + + # Install postgres db and build deps + - sudo /etc/init.d/postgresql stop # stop travis default instance + - sudo apt-get -y remove --purge postgresql-9.1 + - sudo apt-get -y remove --purge postgresql-9.2 + - sudo apt-get -y remove --purge postgresql-9.3 + - sudo apt-get -y remove --purge postgresql-9.4 + - sudo apt-get -y remove --purge postgresql-9.5 + - sudo apt-get -y remove --purge postgresql-9.6 + - sudo rm -rf /var/lib/postgresql/ + - sudo rm -rf /var/log/postgresql/ + - sudo rm -rf /etc/postgresql/ + - sudo apt-get -y remove --purge postgis-2.2 + - sudo apt-get -y autoremove + - sudo apt-get -y install postgresql-9.5=9.5.2-3cdb3 + - sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-3cdb3 + - sudo apt-get -y install postgresql-plpython-9.5=9.5.2-3cdb3 + - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2 + - sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2 + + # configure it to accept local connections from postgres + - echo -e "# TYPE DATABASE USER ADDRESS METHOD \nlocal all postgres trust\nlocal all all trust\nhost all all 127.0.0.1/32 trust" \ + | sudo tee /etc/postgresql/9.5/main/pg_hba.conf + - sudo /etc/init.d/postgresql restart 9.5 + - 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 - export PATH="$HOME/.yarn/bin:$PATH" From 29c1d742029d60daf568cbf08cef9f90dfc1037a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 11:48:35 +0200 Subject: [PATCH 24/35] adding redis 4 to travis --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae9012c9..04d3049b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ jobs: - libgif-dev - libpango1.0-dev - g++-4.9 + - wget before_install: # Add custom PPAs from cartodb @@ -55,7 +56,7 @@ jobs: - echo -e "# TYPE DATABASE USER ADDRESS METHOD \nlocal all postgres trust\nlocal all all trust\nhost all all 127.0.0.1/32 trust" \ | sudo tee /etc/postgresql/9.5/main/pg_hba.conf - sudo /etc/init.d/postgresql restart 9.5 - + - createdb template_postgis - createuser publicuser - psql -c "CREATE EXTENSION postgis" template_postgis @@ -64,6 +65,15 @@ jobs: - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - export PATH="$HOME/.yarn/bin:$PATH" + # instal redis 4 + - wget http://download.redis.io/releases/redis-4.0.8.tar.gz + - tar xvzf redis-4.0.8.tar.gz + - cd redis-4.0.8 + - make + - sudo make install + - cd .. + - rm redis-4.0.8.tar.gz + env: - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9 From 862c79ee16eabae8a3d1237b5acf2a8109ce494c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 11:58:05 +0200 Subject: [PATCH 25/35] removing docker image for xenial and pg95 --- docker/Dockerfile-xenial-pg95 | 73 ----------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 docker/Dockerfile-xenial-pg95 diff --git a/docker/Dockerfile-xenial-pg95 b/docker/Dockerfile-xenial-pg95 deleted file mode 100644 index c8c8d6d8..00000000 --- a/docker/Dockerfile-xenial-pg95 +++ /dev/null @@ -1,73 +0,0 @@ -FROM ubuntu:xenial - -# Use UTF8 to avoid encoding problems with pgsql -ENV LANG C.UTF-8 - -# Add external repos -RUN set -ex \ - && apt-get update \ - && apt-get install -y \ - curl \ - software-properties-common \ - locales \ - && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ - && curl -sL https://deb.nodesource.com/setup_6.x | bash \ - && locale-gen en_US.UTF-8 \ - && update-locale LANG=en_US.UTF-8 - -# Install dependencies and PostGIS 2.4 from sources -RUN set -ex \ - && apt-get update \ - && apt-get install -y \ - g++-4.9 \ - gcc-4.9 \ - git \ - libcairo2-dev \ - libgdal-dev \ - libgdal1i \ - libgeos-dev \ - libgif-dev \ - libjpeg8-dev \ - libjson-c-dev \ - libpango1.0-dev \ - libpixman-1-dev \ - libproj-dev \ - libprotobuf-c-dev \ - libxml2-dev \ - make \ - nodejs \ - pkg-config \ - postgresql-9.5 \ - postgresql-plpython-9.5 \ - postgresql-server-dev-9.5 \ - protobuf-c-compiler \ - redis-server \ - wget \ - && wget http://download.osgeo.org/postgis/source/postgis-2.4.0.tar.gz \ - && tar xvfz postgis-2.4.0.tar.gz \ - && cd postgis-2.4.0 \ - && ./configure \ - && make \ - && make install \ - && cd .. \ - && rm -rf postgis-2.4.0 \ - && wget http://download.redis.io/releases/redis-4.0.8.tar.gz \ - && tar xvzf redis-4.0.8.tar.gz \ - && cd redis-4.0.8 \ - && make \ - && make install \ - && cd .. \ - && rm redis-4.0.8.tar.gz \ - && rm -R redis-4.0.8 \ - && apt-get purge -y wget protobuf-c-compiler \ - && apt-get autoremove -y - -# Configure PostgreSQL -RUN set -ex \ - && echo "listen_addresses='*'" >> /etc/postgresql/9.5/main/postgresql.conf \ - && echo "local all all trust" > /etc/postgresql/9.5/main/pg_hba.conf \ - && echo "host all all 0.0.0.0/0 trust" >> /etc/postgresql/9.5/main/pg_hba.conf \ - && echo "host all all ::1/128 trust" >> /etc/postgresql/9.5/main/pg_hba.conf - -WORKDIR /srv -EXPOSE 5858 From dce6349fcbeb6c495a98c46cc41eaa3568efde72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 12:01:56 +0200 Subject: [PATCH 26/35] sudo required to right place --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04d3049b..33d4ee99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ -sudo: required - jobs: include: - - services: + - sudo: required + services: - docker language: generic before_install: docker pull cartoimages/engine-xenial-pg101 From 02b12f370a8742e5b97d8a19b1836574aed8ed4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 13:05:52 +0200 Subject: [PATCH 27/35] adding an small docker reference --- docker/reference.md | 23 +++++++++++++++++++++++ package.json | 8 ++++---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 docker/reference.md diff --git a/docker/reference.md b/docker/reference.md new file mode 100644 index 00000000..50e135dd --- /dev/null +++ b/docker/reference.md @@ -0,0 +1,23 @@ +After running the tests with docker, you will need Docker installed and the docker image downloaded. + +## Install docker +`sudo apt install docker.io && sudo usermod -aG docker $(whoami)` + +## Download image +`docker pull cartoimages/engine-xenial-pg101` + +## Update image +- Edit the docker image file with your desired changes +- Build image: + - `docker build -t cartoimages/engine-xenial-pg101 -f docker/Dockerfile-xenial-pg101 docker/` +- Upload to docker hub: + - Login into docker hub: + - `docker login` + - Create tag: + - `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 \ No newline at end of file diff --git a/package.json b/package.json index fce46f9d..ad5ee9c9 100644 --- a/package.json +++ b/package.json @@ -65,10 +65,10 @@ "preinstall": "make pre-install", "test": "make test-all", "update-internal-deps": "rm -rf node_modules && rm -f yarn.lock && yarn", - "docker-install": "sudo apt install docker.io && sudo usermod -aG docker $(whoami)", - "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-bash": "docker run -it -v `pwd`:/srv cartoimages/windshaft-testing bash" + "docker-pull": "docker pull cartoimages/engine-xenial-pg101", + "docker-test": "docker run -v `pwd`:/srv cartoimages/engine-xenial-pg101 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/engine-xenial-pg101 bash", + "docker-build": "docker build -t cartoimages/engine-xenial-pg101 -f docker/Dockerfile-xenial-pg101 docker/" }, "engines": { "node": ">=6.9", From 4442200d6ba5212b6ee2f372301017431080fc82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 13:08:46 +0200 Subject: [PATCH 28/35] EOF line --- docker/reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/reference.md b/docker/reference.md index 50e135dd..9619ab88 100644 --- a/docker/reference.md +++ b/docker/reference.md @@ -20,4 +20,4 @@ After running the tests with docker, you will need Docker installed and the dock ## Useful commands -We have some useful commands created in package.json \ No newline at end of file +We have some useful commands created in package.json From 9788af42737f406de7a1ed1c0e8230d565cd7a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 15:46:10 +0200 Subject: [PATCH 29/35] adding ENV vars and Postgres configuration. Also, Postgres starts auto --- docker/Dockerfile-xenial-pg101 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile-xenial-pg101 b/docker/Dockerfile-xenial-pg101 index 2aa9175e..d1d70589 100644 --- a/docker/Dockerfile-xenial-pg101 +++ b/docker/Dockerfile-xenial-pg101 @@ -2,6 +2,10 @@ FROM ubuntu:xenial # Use UTF8 to avoid encoding problems with pgsql ENV LANG C.UTF-8 +ENV NPROCS 1 +ENV JOBS 1 +ENV CXX g++-4.9 +ENV PGUSER postgres # Add external repos RUN set -ex \ @@ -72,7 +76,14 @@ RUN set -ex \ && echo "listen_addresses='*'" >> /etc/postgresql/10/main/postgresql.conf \ && echo "local all all trust" > /etc/postgresql/10/main/pg_hba.conf \ && echo "host all all 0.0.0.0/0 trust" >> /etc/postgresql/10/main/pg_hba.conf \ - && echo "host all all ::1/128 trust" >> /etc/postgresql/10/main/pg_hba.conf + && echo "host all all ::1/128 trust" >> /etc/postgresql/10/main/pg_hba.conf \ + && /etc/init.d/postgresql start \ + && createdb template_postgis \ + && createuser publicuser \ + && psql -c "CREATE EXTENSION postgis" template_postgis \ + && /etc/init.d/postgresql stop WORKDIR /srv EXPOSE 5858 + +CMD /etc/init.d/postgresql start From 8d3503e0fce2d628a409cbd44497d50c0e9d8a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 15:46:57 +0200 Subject: [PATCH 30/35] removing unneeded configuration --- run_tests_docker.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/run_tests_docker.sh b/run_tests_docker.sh index 8cc8c093..3f9ca4e7 100644 --- a/run_tests_docker.sh +++ b/run_tests_docker.sh @@ -1,11 +1,9 @@ -export NPROCS=1 && export JOBS=1 && export CXX=g++-4.9 && export PGUSER=postgres +# start PostgreSQL +/etc/init.d/postgresql start +# install dependencies npm install -g yarn@0.27.5 yarn - /etc/init.d/postgresql start - -createdb template_postgis && createuser publicuser -psql -c "CREATE EXTENSION postgis" template_postgis - +# run tests POSTGIS_VERSION=2.4 npm test \ No newline at end of file From e76850fce634b5e8c2bee1bb2b764d2143e0e9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 27 Apr 2018 15:47:40 +0200 Subject: [PATCH 31/35] updating docker-test with new run_tests_docker.sh --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad5ee9c9..69075adf 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "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 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/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/" }, From 6bb8c9c2717b8266ef3a68de23f0719ad2894956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 3 May 2018 10:47:20 +0200 Subject: [PATCH 32/35] EOF line --- run_tests_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_tests_docker.sh b/run_tests_docker.sh index 3f9ca4e7..4a6b142a 100644 --- a/run_tests_docker.sh +++ b/run_tests_docker.sh @@ -6,4 +6,4 @@ npm install -g yarn@0.27.5 yarn # run tests -POSTGIS_VERSION=2.4 npm test \ No newline at end of file +POSTGIS_VERSION=2.4 npm test From 066626d92844f9ecab9b5f5aec3984a6f0c60ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 3 May 2018 11:18:09 +0200 Subject: [PATCH 33/35] simplify docker commands --- .travis.yml | 2 +- docker/reference.md | 4 ---- package.json | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) 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", From 7c5ed7e8f8c5897cb48369c256d6cc755c3d5862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Thu, 3 May 2018 17:38:54 +0200 Subject: [PATCH 34/35] using the correct docker account --- .travis.yml | 2 +- ...-xenial-pg101 => Dockerfile-nodejs6-xenial-pg101} | 0 docker/reference.md | 12 ++++++++---- package.json | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) rename docker/{Dockerfile-xenial-pg101 => Dockerfile-nodejs6-xenial-pg101} (100%) diff --git a/.travis.yml b/.travis.yml index 40fbc6be..3e0b1daa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jobs: services: - docker language: generic - before_install: docker pull cartoimages/engine-xenial-pg101 + before_install: docker pull carto/nodejs6-xenial-pg101 script: npm run docker-test - dist: precise addons: diff --git a/docker/Dockerfile-xenial-pg101 b/docker/Dockerfile-nodejs6-xenial-pg101 similarity index 100% rename from docker/Dockerfile-xenial-pg101 rename to docker/Dockerfile-nodejs6-xenial-pg101 diff --git a/docker/reference.md b/docker/reference.md index 2d22e858..3c49c433 100644 --- a/docker/reference.md +++ b/docker/reference.md @@ -4,16 +4,20 @@ After running the tests with docker, you will need Docker installed and the dock `sudo apt install docker.io && sudo usermod -aG docker $(whoami)` ## Download image -`docker pull cartoimages/engine-xenial-pg101` +`docker pull carto/IMAGE` + +## Carto account +https://hub.docker.com/r/carto/ ## Update image - Edit the docker image file with your desired changes - Build image: - - `docker build -t cartoimages/engine-xenial-pg101 -f docker/Dockerfile-xenial-pg101 docker/` + - `docker build -t carto/IMAGE -f docker/DOCKER_FILE docker/` + - Upload to docker hub: - Login into docker hub: - `docker login` - Create tag: - - `docker tag cartoimages/engine-xenial-pg101 cartoimages/engine-xenial-pg101` + - `docker tag carto/IMAGE carto/IMAGE` - Upload: - - `docker push cartoimages/engine-xenial-pg101` + - `docker push carto/IMAGE` diff --git a/package.json b/package.json index 050998f1..1387632c 100644 --- a/package.json +++ b/package.json @@ -65,8 +65,8 @@ "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 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-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-bash": "docker run -it -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash" }, "engines": { "node": ">=6.9", From 910f5693d8d86c1022af713bd3c2f4b57dcb21ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 7 May 2018 10:43:15 +0200 Subject: [PATCH 35/35] updating news --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 9fdf599a..74bbe860 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ Released 2018-mm-dd New features: +- CI tests with Ubuntu Xenial + PostgreSQL 10.1 and Ubuntu Precise + PostgreSQL 9.5 Bug Fixes: