From 65e9a7b25382d08b1d09cbb9435c94c3ca172c6d Mon Sep 17 00:00:00 2001
From: Stefan Verhoeven <s.verhoeven@esciencecenter.nl>
Date: Tue, 9 Apr 2019 15:20:17 +0200
Subject: [PATCH] Upgrade node + repin scikit-learn + sync config with sample

---
 Dockerfile            | 11 ++++++-----
 config/app_config.yml |  9 ++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 05cbd29..37b8b03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,6 +108,7 @@ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
     nginx-light \
     net-tools \
     ruby2.5-dev \
+    xz-utils \
   --no-install-recommends && \
   rm -rf /var/lib/apt/lists/*
 
@@ -126,9 +127,9 @@ RUN cd /opt && \
     rm -rf varnish-3.0.7 varnish-3.0.7.tgz
 
 # Install NodeJS
-RUN curl https://nodejs.org/download/release/v6.9.2/node-v6.9.2-linux-x64.tar.gz| tar -zxf - --strip-components=1 -C /usr && \
+RUN curl https://nodejs.org/dist/v10.15.3/node-v10.15.3-linux-x64.tar.xz |tar -Jxf - --strip-components=1 -C /usr && \
   npm install -g grunt-cli && \
-  npm install -g npm@3.10.9 && \
+  npm install -g npm@6 && \
   rm -r /tmp/npm-* /root/.npm
 
 # Setting PostgreSQL
@@ -147,7 +148,7 @@ RUN cd / && \
     make install && \
     # Numpy gets upgraded after scikit-learn is installed
     # make sure scikit-learn is compatible with currently installed numpy, by reinstalling
-    pip install --force-reinstall --no-cache-dir scikit-learn==0.14.1 && \
+    pip install --force-reinstall --no-cache-dir scikit-learn==0.17.0 && \
     cd ..
 
 # Initialize template postgis db
@@ -168,9 +169,9 @@ RUN git clone git://github.com/CartoDB/CartoDB-SQL-API.git && \
 RUN git clone git://github.com/CartoDB/Windshaft-cartodb.git && \
     cd Windshaft-cartodb && \
     git checkout $WINDSHAFT_VERSION && \
-    npm install -g yarn@0.27.5 && \
+    npm install -g yarn && \
     yarn install && \
-    rm -r /tmp/npm-* /root/.npm && \
+    #rm -r /tmp/npm-* /root/.npm && \
     mkdir logs
 
 # Install CartoDB
diff --git a/config/app_config.yml b/config/app_config.yml
index 35e3410..42460a5 100644
--- a/config/app_config.yml
+++ b/config/app_config.yml
@@ -7,6 +7,7 @@ defaults: &defaults
   ogr2ogr:
     binary:           'which ogr2ogr'
     csv_guessing:     true
+    memory_limit:
   debug_assets: true
   mandatory_keys:     [layer_opts, sql_api, varnish_management, redis, session_domain]
   session_domain:     'cartodb.localhost'
@@ -129,7 +130,7 @@ defaults: &defaults
     protocol: 'https'
     username: 'common-data'
     base_url: 'https://common-data.carto.com'
-    format: 'shp'
+    format: 'gpkg'
     generate_every: 86400
   explore_api:
     username: ''
@@ -156,6 +157,7 @@ defaults: &defaults
     critical: false
     host: '127.0.0.1'
     port: 6082
+    http_port: 6081
     purge_command: 'purge'
     retries: 5
     timeout: 5
@@ -207,10 +209,11 @@ defaults: &defaults
       base_url: ''
       api_key: ''
       table_name: ''
-    mapzen:
-      search_bar_api_key: ''
+    search_bar_provider: ''
     mapbox:
       search_bar_api_key: ''
+    tomtom:
+      search_bar_api_key: ''
     # api:
     #   host: 'localhost'
     #   port: '5432'