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

Merge branch 'master' into geocoder2

Browse Source
This commit is contained in:
Stefan Verhoeven 2017-04-13 21:16:48 +02:00
commit 723dc41d65
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -6,7 +6,7 @@ MAINTAINER Stefan Verhoeven <s.verhoeven@esciencecenter.nl>
# Configuring locales # Configuring locales
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN dpkg-reconfigure locales && \ RUN apt-get update && apt-get install -y -q apt-utils && apt-get install -y -q locales && dpkg-reconfigure locales && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
update-locale LANG=en_US.UTF-8 update-locale LANG=en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
@ -14,7 +14,6 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
apt-get update && \
apt-get install -y -q \ apt-get install -y -q \
build-essential \ build-essential \
autoconf \ autoconf \

4
README.md
View File

@ -27,7 +27,7 @@ How to run the container:
------------------------- -------------------------
``` ```
docker run -d -p 80:80 sverhoeven/cartodb docker run -d -p 80:80 -h cartodb.localhost sverhoeven/cartodb
``` ```
The CartoDB instance has been configured with the hostname `cartodb.localhost`, this means the web browser and web server need to be able to resolve `cartodb.localhost` to an IP adress of the machine where the web server is running. The CartoDB instance has been configured with the hostname `cartodb.localhost`, this means the web browser and web server need to be able to resolve `cartodb.localhost` to an IP adress of the machine where the web server is running.
@ -42,7 +42,7 @@ How to use a different hostname:
For example to use `cartodb.example.com` as a hostname start with: For example to use `cartodb.example.com` as a hostname start with:
``` ```
docker run -d -p 80:80 -e CARTO_HOST=cartodb.example.com sverhoeven/cartodb docker run -d -p 80:80 -h cartodb.example.com sverhoeven/cartodb
``` ```
The chosen hostname should also resolve to an IP adress of the machine where the web server is running. The chosen hostname should also resolve to an IP adress of the machine where the web server is running.

4
config/WS-dev.js
View File

@ -34,8 +34,8 @@ var config = {
// 2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`. // 2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
// 3. {{=it.port}}: will use the `port` from this very same configuration file. // 3. {{=it.port}}: will use the `port` from this very same configuration file.
,resources_url_templates: { ,resources_url_templates: {
http: 'http://cartodb.localhost:{{=it.port}}/user/{{=it.user}}/api/v1/map', http: 'http://cartodb.localhost/user/{{=it.user}}/api/v1/map',
https: 'http://cartodb.localhost:{{=it.port}}/user/{{=it.user}}/api/v1/map' https: 'http://cartodb.localhost/user/{{=it.user}}/api/v1/map'
} }
// Maximum number of connections for one process // Maximum number of connections for one process

11
config/app_config.yml
View File

@ -29,8 +29,7 @@ defaults: &defaults
internal: internal:
protocol: 'http' protocol: 'http'
domain: 'cartodb.localhost' domain: 'cartodb.localhost'
port: '8181' port: '80'
host: '127.0.0.1'
verifycert: false verifycert: false
private: private:
protocol: 'http' protocol: 'http'
@ -78,8 +77,8 @@ defaults: &defaults
api_key: api_key:
metrics: metrics:
hubspot: hubspot:
events_host: 'http://track.hubspot.com' events_host: ''
token: 'yourtoken' token: ''
form_ids: form_ids:
newsletter: '' newsletter: ''
event_ids: event_ids:
@ -256,10 +255,10 @@ defaults: &defaults
debug: false debug: false
visible: true visible: true
tiler_domain: "cartodb.localhost" tiler_domain: "cartodb.localhost"
tiler_port: "8181" tiler_port: "80"
tiler_protocol: "http" tiler_protocol: "http"
sql_domain: "cartodb.localhost" sql_domain: "cartodb.localhost"
sql_port: "8080" sql_port: "80"
sql_protocol: "http" sql_protocol: "http"
extra_params: { cache_policy: 'persist' } extra_params: { cache_policy: 'persist' }
tile_style_history: [] tile_style_history: []

3
startup.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
CARTO_HOST=${CARTO_HOST=cartodb.localhost} perl -pi -e 's/cartodb\.localhost/$ENV{"HOSTNAME"}/g' /etc/nginx/sites-enabled/default /cartodb/config/app_config.yml /Windshaft-cartodb/config/environments/development.js
perl -pi -e 's/cartodb\.localhost/$ENV{"CARTO_HOST"}/g' /etc/nginx/sites-enabled/default /cartodb/config/app_config.yml /Windshaft-cartodb/config/environments/development.js
service postgresql start service postgresql start
service redis-server start service redis-server start