Commit Graph

145 Commits

Author SHA1 Message Date
753aa9af2c 更新 'Dockerfile' 2023-05-11 19:14:41 +08:00
1d5e12b494 更新 'Dockerfile' 2023-05-11 19:14:06 +08:00
c0d0b50d0a 添加 'sources.list' 2023-05-11 19:13:18 +08:00
Stefan Verhoeven
af47cc8cce Increase import limits
Fixes #80
2019-11-07 17:47:16 +01:00
Stefan Verhoeven
d1395bb0b7 sql api requires a logs dir 2019-10-24 13:45:00 +02:00
Stefan Verhoeven
7f44060003 Adjust geocoder user email adress to be valid 2019-08-14 09:49:52 +02:00
Stefan Verhoeven
2f5575c41b
Merge pull request #79 from anthonyesper/patch-4
Fix Dev_User for MX Record Check
2019-08-14 09:49:24 +02:00
Stefan Verhoeven
8e2cd5c06d
Merge pull request #78 from anthonyesper/patch-1
Fix for CartoDB MX Record check
2019-08-14 09:49:14 +02:00
anthonyesper
0992ed80f0
Fix Dev_User for MX Record Check
Fix for Dev_User for MX Record Check
2019-08-08 21:13:27 -04:00
anthonyesper
b06682596d
Fix for CartoDB MX Record check
This is a fix for the MX record check on email domains for the org setup.
2019-08-08 21:01:09 -04:00
Stefan Verhoeven
d1832661cb
Merge pull request #76 from nballenger/update_caching
Update caching
2019-07-22 08:44:27 +02:00
Nick Ballenger
f0b5b7e79f Updated Varnish to cache SQL API / Windshaft
The previous version of this file was enough to cache requests for the
SQL API, but unfortunately no traffic was ever reaching Varnish to be
cached. Nginx was proxying directly to the SQL API port, and Varnish was
set to listen on 6081, so it wasn't able to intercept those requests. I
updated the Nginx proxy config to aim at 6081 for requests to both SQL
API and Windshaft, so now Varnish is receiving traffic. However, in
order to know which backend to send traffic to, I had to add a custom
HTTP header in the Nginx proxy pass. That header is picked up in the
`vcl_recv` varnish subroutine and used to switch between backends.

Additionally I've added logic for controlling what hosts can issue an
HTTP PURGE command--in this case just localhost, since everything is on
a single image. The purges will typically come from a Postgres trigger.

As an overview of the purge related changes, see the Varnish docs here:

https://varnish-cache.org/docs/3.0/tutorial/purging.html#http-purges
2019-07-18 16:27:25 -07:00
Nick Ballenger
d02a917f38 Commented out 'invalidation_service' section
I commented out the entire 'invalidation_service' section from
app_config.yml. It _should_ be sufficient to set 'enabled' to false in
that block, in order to prevent the Redis/Resque based invalidation
service from being used inside the postgres trigger for invalidating
cache items, but it's actually easier to just comment out the whole
block. See this portion of the Carto code for reference:

05a05fd695/app/models/user/db_service.rb (L1062-L1070)

The branch we want to go down in that code is the middle one--we want to
end up with `create_function_invalidate_varnish_http` running. That will
create a postgres trigger based on hitting the Varnish server's HTTP
listener, which is running on 6081. (You could have it hit the telnet
port by taking the third branch of that code, but given that telnet
isn't included in later Varnish versions, best not to.)

You want to avoid the first branch of that code, `create_function_invalidate_varnish_invalidation_service`,
because it includes this line:

05a05fd695/app/models/user/db_service.rb (L1601)

That's calling a custom Redis command, `TCH`, which is defined in a repo
that Carto has not open sourced--meaning the 'invalidation service' (as
a Redis job queue for the Resque job runner) can't be used in open
source Carto (unless you reverse engineer the Redis commands it uses.)
2019-07-18 16:17:28 -07:00
Nick Ballenger
de29a46c57 Changing path to nginx proxy conf file 2019-07-18 16:16:45 -07: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
Stefan Verhoeven
9acb1b4919
Merge pull request #75 from christophekey/christophekey-npminstall
Update Dockerfile with npm install, not yarn
2019-06-19 14:16:13 +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
Stefan Verhoeven
fe1a12d1d1
Merge pull request #69 from bplmp/patch-1
Specify bundler version
2019-01-04 15:52:22 +01: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
5af3fe24e1 Moved build chapter to bottom
To deter users from building the image themselves, because most times it is easier/quicker to pull the image from Docker Hub.
2018-09-20 08:44:17 +02:00
Stefan Verhoeven
397ffca212 Disable the request size max limit
Refs #63
2018-09-20 08:43:20 +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
c9a98f6ae5 During startup make postgres owner of PGDATA dir if not already.
Refs #51
2018-08-06 17:06:33 +02:00
Stefan Verhoeven
da676bc583 Using os installed ruby instead of rvm 2018-08-06 14:57:50 +02:00
Stefan Verhoeven
a3c9628836 When specifying hostname using env var use only one hostname. 2018-08-06 14:44:50 +02:00
Stefan Verhoeven
c32b1e1cd2 Rename active record adaptor 2018-07-27 09:11:15 +02:00
Stefan Verhoeven
f979bc8e84 Fixes #49 2018-07-27 09:10:50 +02:00
Stefan Verhoeven
fcb1b89c98 Update uid of postgres user
Refs #46
2018-07-16 17:28:30 +02:00
Stefan Verhoeven
a1f1ceaf86 Mention tomtom and mapbox as geocoders.
Also trigger new build on DockerHub to get fix of https://github.com/CartoDB/carto.js/issues/2161
2018-07-04 20:08:27 +02:00
Stefan Verhoeven
467daa8bb4 Prefer hostname over ip 2018-07-04 11:27:25 +02:00
Stefan Verhoeven
9d969b8699 Merge remote-tracking branch 'origin/master' 2018-07-04 11:18:48 +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
3ebc1d411f cdb_service_quota_info() failed due to missing tomtom config
Added it
2018-06-22 11:23:45 +02:00
Stefan Verhoeven
0f1d69ebe4 Regenerate api keys during startup 2018-06-22 11:23:20 +02:00
Stefan Verhoeven
b9efc49137 Correct CARTO_HOSTNAME setter 2018-06-22 11:22:59 +02:00
Stefan Verhoeven
5e721f0cac Sync config file 2018-06-22 10:29:42 +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
be4dad7bde Allow to use env var to set hostname
Refs #39
2018-06-22 10:27:27 +02:00
Stefan Verhoeven
f49dda90d6
Merge pull request #31 from radu-tutueanu/fix-pip-install
Downgrade pip
2018-04-20 13:02:18 +02:00
Radu Tutueanu
20a8df770e Downgrade pip 2018-04-20 10:37:00 +01:00
Stefan Verhoeven
f098d956c0 Enable private maps
Fixes #26
2018-04-04 22:32:06 +02:00
Stefan Verhoeven
8ff9dcd952 Sync config files
Refs #29
2018-04-04 22:23:54 +02:00