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

Upgrade node + repin scikit-learn + sync config with sample

Browse Source
This commit is contained in:
Stefan Verhoeven 2019-04-09 15:20:17 +02:00
parent fe1a12d1d1
commit 65e9a7b253
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -108,6 +108,7 @@ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
nginx-light \ nginx-light \
net-tools \ net-tools \
ruby2.5-dev \ ruby2.5-dev \
xz-utils \
--no-install-recommends && \ --no-install-recommends && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -126,9 +127,9 @@ RUN cd /opt && \
rm -rf varnish-3.0.7 varnish-3.0.7.tgz rm -rf varnish-3.0.7 varnish-3.0.7.tgz
# Install NodeJS # 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 grunt-cli && \
npm install -g npm@3.10.9 && \ npm install -g npm@6 && \
rm -r /tmp/npm-* /root/.npm rm -r /tmp/npm-* /root/.npm
# Setting PostgreSQL # Setting PostgreSQL
@ -147,7 +148,7 @@ RUN cd / && \
make install && \ make install && \
# Numpy gets upgraded after scikit-learn is installed # Numpy gets upgraded after scikit-learn is installed
# make sure scikit-learn is compatible with currently installed numpy, by reinstalling # 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 .. cd ..
# Initialize template postgis db # 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 && \ RUN git clone git://github.com/CartoDB/Windshaft-cartodb.git && \
cd Windshaft-cartodb && \ cd Windshaft-cartodb && \
git checkout $WINDSHAFT_VERSION && \ git checkout $WINDSHAFT_VERSION && \
npm install -g yarn@0.27.5 && \ npm install -g yarn && \
yarn install && \ yarn install && \
rm -r /tmp/npm-* /root/.npm && \ #rm -r /tmp/npm-* /root/.npm && \
mkdir logs mkdir logs
# Install CartoDB # Install CartoDB

9
config/app_config.yml
View File

@ -7,6 +7,7 @@ defaults: &defaults
ogr2ogr: ogr2ogr:
binary: 'which ogr2ogr' binary: 'which ogr2ogr'
csv_guessing: true csv_guessing: true
memory_limit:
debug_assets: true debug_assets: true
mandatory_keys: [layer_opts, sql_api, varnish_management, redis, session_domain] mandatory_keys: [layer_opts, sql_api, varnish_management, redis, session_domain]
session_domain: 'cartodb.localhost' session_domain: 'cartodb.localhost'
@ -129,7 +130,7 @@ defaults: &defaults
protocol: 'https' protocol: 'https'
username: 'common-data' username: 'common-data'
base_url: 'https://common-data.carto.com' base_url: 'https://common-data.carto.com'
format: 'shp' format: 'gpkg'
generate_every: 86400 generate_every: 86400
explore_api: explore_api:
username: '' username: ''
@ -156,6 +157,7 @@ defaults: &defaults
critical: false critical: false
host: '127.0.0.1' host: '127.0.0.1'
port: 6082 port: 6082
http_port: 6081
purge_command: 'purge' purge_command: 'purge'
retries: 5 retries: 5
timeout: 5 timeout: 5
@ -207,10 +209,11 @@ defaults: &defaults
base_url: '' base_url: ''
api_key: '' api_key: ''
table_name: '' table_name: ''
mapzen: search_bar_provider: ''
search_bar_api_key: ''
mapbox: mapbox:
search_bar_api_key: '' search_bar_api_key: ''
tomtom:
search_bar_api_key: ''
# api: # api:
# host: 'localhost' # host: 'localhost'
# port: '5432' # port: '5432'