Commit Graph

71 Commits

Author SHA1 Message Date
09d6962abb 更新 'Dockerfile' 2023-05-11 22:12:06 +08:00
696b1a9d9b 更新 'Dockerfile' 2023-05-11 21:55:48 +08:00
249f7503fd 更新 'Dockerfile' 2023-05-11 21:47:34 +08:00
cf34a0bc3e 更新 'Dockerfile' 2023-05-11 21:45:53 +08:00
f5b5bf3d58 更新 'Dockerfile' 2023-05-11 21:44:10 +08:00
5c2f0b2fc7 更新 'Dockerfile' 2023-05-11 21:42:49 +08:00
2df68eb875 更新 'Dockerfile' 2023-05-11 21:40:31 +08:00
82e30755b5 更新 'Dockerfile' 2023-05-11 21:33:45 +08:00
2a3ae87b08 更新 'Dockerfile' 2023-05-11 21:31:52 +08:00
e19fcf0683 更新 'Dockerfile' 2023-05-11 21:20:01 +08:00
dd83d384a3 更新 'Dockerfile' 2023-05-11 20:44:21 +08:00
758c0d1991 更新 'Dockerfile' 2023-05-11 19:39:49 +08:00
38bfc560e0 更新 'Dockerfile' 2023-05-11 19:24:58 +08:00
1faf563acd 更新 'Dockerfile' 2023-05-11 19:19:10 +08:00
753aa9af2c 更新 'Dockerfile' 2023-05-11 19:14:41 +08:00
1d5e12b494 更新 'Dockerfile' 2023-05-11 19:14:06 +08:00
Stefan Verhoeven
d1395bb0b7 sql api requires a logs dir 2019-10-24 13:45:00 +02:00
Nick Ballenger
5f0eb86bed Changing the Nginx config to a single file
I've combined the core nginx.conf with the proxy config, which all goes
into /etc/nginx/nginx.conf.

I've made a number of changes:

* Nginx now proxies both SQL API and Windshaft requests through Varnish.
* Nginx adds a custom HTTP header, X-Carto-Service, so that Varnish can
differentiate between backends (since it can't do so based on incoming
port).
* I've modified the primary Nginx log format to include more information
on how requests are being proxied--you can now see the upstream address
for proxied requests.
* I've added the `proxy_no_cache` and `proxy_cache_bypass` directives to
the Windshaft and SQL API proxy sections. Without those directives,
Nginx may attempt to act as a cache, returning 304 Not Modified for
resources that more accurately should be cached by Varnish (whose cache
is invalidated via a Postgres trigger for updated metadata).
2019-07-18 16:08:53 -07:00
Stefan Verhoeven
906d496494 CartoDB-SQL-API switched from yarn to npm
Similar to Windshaft-cartodb see https://github.com/sverhoeven/docker-cartodb/pull/75
2019-06-19 14:18:02 +02:00
Christophe
dc32f39926
Update Dockerfile 2019-06-12 13:17:15 +01:00
Stefan Verhoeven
b106b301c9 sql api was unable to find pg module
Switched to yarn to install deps in flat hierarchy instead of npms nested
2019-04-13 17:00:12 +02:00
Stefan Verhoeven
65e9a7b253 Upgrade node + repin scikit-learn + sync config with sample 2019-04-09 15:20:17 +02:00
Bernardo Loureiro
57ab2e00ea
Specify bundler version
Before, the Dockerfile was installing the latest bundler version, which is only compatible with Ruby >= 2.3.0. I've changed the bundler version to 1.17.3, which requires Ruby >= 1.8.7. Version info here: https://rubygems.org/gems/bundler/versions/1.17.3
2019-01-03 14:39:42 -02:00
Stefan Verhoeven
2f0be5a27f Numpy gets upgraded after scikit-learn is installed.
Make sure scikit-learn is compatible with currently installed numpy, by reinstalling

Refs #56
Refs #53
2018-08-26 13:12:59 +02:00
Stefan Verhoeven
f979bc8e84 Fixes #49 2018-07-27 09:10:50 +02:00
Stefan Verhoeven
943c32ff59 Enable new dashboard flag
Back to using master branch of cartodb repo
2018-07-04 11:10:16 +02:00
Stefan Verhoeven
0faa6b44e5 Using OS ogr2ogr 2018-07-02 23:07:35 +02:00
Stefan Verhoeven
c4d37ada9d Pinning to v4.12.26, dashboard ok 2018-07-02 22:38:10 +02:00
Stefan Verhoeven
342010e7bd Pin to working version of repos 2018-07-02 22:37:56 +02:00
Stefan Verhoeven
27155eca32 Trying to make carto work on ubuntu 18.04
Failing after logging page has header/footer but nothing else, so no way to create dataset/map/logout
2018-06-22 15:20:16 +02:00
Stefan Verhoeven
212a60dab3 Use label for maintainer 2018-06-22 11:24:28 +02:00
Stefan Verhoeven
53e2998e58 Dont install pip with apt
Upgrading pip afterwards gave problems, so installing it using get-pip
2018-06-22 10:28:11 +02:00
Stefan Verhoeven
12977507d9 Install observatory extension
Config still points to global common data instead of local observatory
2018-02-17 13:54:15 +01:00
Stefan Verhoeven
66a5be7f09 Force yarn version for windshaft
Fixes #23
2018-02-17 13:53:49 +01:00
Stefan Verhoeven
d919441db4 Varnish download location has moved + Cartodb repo now longer accepts environment during grunt task, so dropped it 2017-09-08 19:03:45 +02:00
Stefan Verhoeven
5218b9940e Enabled sync tables for all users + periodically trigger sync tables task
Refs #11
2017-08-01 22:07:30 +02:00
Stefan Verhoeven
790038dcad Added healthcheck 2017-07-01 21:54:37 +02:00
Stefan Verhoeven
685c0f1f80 Give user and organization geocoder quota
Also remove extra space so gecoder is configured correctly in user/org db
2017-07-01 21:52:35 +02:00
Stefan Verhoeven
b258ef9b86 Merge branch 'master' into geocoder2 2017-07-01 18:34:08 +02:00
Stefan Verhoeven
1754fac6d2 Fixed discrepancy between cartodb-postgresql version in it's repo and cartodb repo
Install cartodb-postgresql using cartdb/lib/sql submodule.
2017-07-01 17:22:27 +02:00
Sriram Raghunathan
06ea212440 Fix, npm and node version dependency
Signed-off-by: Sriram Raghunathan <rsriram7@visteon.com>
2017-06-24 22:48:06 +05:30
Sriram Raghunathan
a6f7bf7fb6 Fix unreachable RVM url
Signed-off-by: Sriram Raghunathan <rsriram7@visteon.com>
2017-06-23 15:54:07 +05:30
Stefan Verhoeven
2d8286c5df Able to fill internal geocoder tables, but get 'too many source rows' error during georeference analysis of countries. 2017-04-13 23:54:00 +02:00
Stefan Verhoeven
723dc41d65 Merge branch 'master' into geocoder2 2017-04-13 21:16:48 +02:00
Stefan Verhoeven
bc71a1bf83 Use -h to specify hostname + disabled hubspot + fix missing locales from upstream 2017-04-13 21:14:05 +02:00
Stefan Verhoeven
92e894a1b3 Install locales 2017-04-13 16:29:45 +02:00
Stefan Verhoeven
d6832a177f Further progress configuring geocoder.
Now brower error:
```
error: cdb_dataservices_client._cdb_service_quota_info(2): [cartodb_dev_user_5357a703-8b69-48d4-b114-122e9498aca7_db] REMOTE ERROR: spiexceptions.ExternalRoutineException: cartodb_services.metrics.config.ConfigException: Here maps configuration missing↵    at Connection.parseE (/CartoDB-SQL-API/node_modules/cartodb-psql/node_modules/pg/lib/connection.js:560:11)↵    at Connection.parseMessage (/CartoDB-SQL-API/node_modules/cartodb-psql/node_modules/pg/lib/connection.js:383:17)↵    at Socket.<anonymous> (/CartoDB-SQL-API/node_modules/cartodb-psql/node_modules/pg/lib/connection.js:119:22)↵    at Socket.emit (events.js:95:17)↵    at Socket.<anonymous> (_stream_readable.js:765:14)↵    at Socket.emit (events.js:92:17)↵    at emitReadable_ (_stream_readable.js:427:10)↵    at emitReadable (_stream_readable.js:423:5)↵    at readableAddChunk (_stream_readable.js:166:9)↵    at Socket.Readable.push (_stream_readable.js:128:10)↵    at TCP.onread (net.js:529:21)"
Name

```
When map without geometry is opened.
2017-04-06 22:24:10 +02:00
Stefan Verhoeven
b26f4688f8 Reduced image size rrom 4.87 to 3.52 Gb
By cleaning up unneeded files
2017-04-04 22:06:48 +02:00
Stefan Verhoeven
0e6fe18331 Added crankshaft extension to PostgreSQL template 2017-04-04 21:13:53 +02:00
Stefan Verhoeven
8ef276cc22 :lipstick 2017-04-04 08:21:59 +02:00