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

Use -h to specify hostname + disabled hubspot + fix missing locales from upstream

Browse Source
This commit is contained in:
Stefan Verhoeven 2017-04-13 21:14:05 +02:00
parent 92e894a1b3
commit bc71a1bf83
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -6,12 +6,14 @@ MAINTAINER Stefan Verhoeven <s.verhoeven@esciencecenter.nl>
# Configuring locales # Configuring locales
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
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 && \
update-locale LANG=en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en 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 \
@ -90,14 +92,9 @@ RUN useradd -m -d /home/cartodb -s /bin/bash cartodb && \
wget \ wget \
nginx-light \ nginx-light \
net-tools \ net-tools \
locales \
--no-install-recommends && \ --no-install-recommends && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN dpkg-reconfigure locales && \
locale-gen en_US.UTF-8 && \
update-locale LANG=en_US.UTF-8
RUN git config --global user.email you@example.com RUN git config --global user.email you@example.com
RUN git config --global user.name "Your Name" RUN git config --global user.name "Your Name"

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/app_config.yml
View File

@ -77,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:

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