public
/
ottertune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose rabbitmq host in docker

This commit is contained in:
dvanaken 2019-12-11 17:55:19 +01:00 committed by Dana Van Aken
parent 6d76b22e3b
commit d25d5b4cca
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/Dockerfile.web
View File

@ -8,9 +8,7 @@ COPY ./docker/credentials.py ./website/settings
COPY ./docker/start.sh ./docker/start-test.sh ./docker/wait-for-it.sh ./ COPY ./docker/start.sh ./docker/start-test.sh ./docker/wait-for-it.sh ./
RUN /install.sh web \ RUN /install.sh web \
&& chmod +x ./*.sh \ && chmod +x ./*.sh
&& sed s/'@localhost'/'@rabbitmq'/g ./website/settings/common.py > tmp \
&& mv tmp ./website/settings/common.py
ENV DJANGO_SETTINGS_MODULE=website.settings ENV DJANGO_SETTINGS_MODULE=website.settings
ENV C_FORCE_ROOT=true ENV C_FORCE_ROOT=true

2
docker/credentials.py
View File

@ -4,6 +4,7 @@ import string
from os import environ as env from os import environ as env
debug = env.get('DEBUG', 'true').lower() == 'true' debug = env.get('DEBUG', 'true').lower() == 'true'
rabbitmq_host = env.get('RABBITMQ_HOST', 'rabbitmq')
backend = env.get('BACKEND', 'postgresql') backend = env.get('BACKEND', 'postgresql')
db_name = env.get('DB_NAME', 'ottertune') db_name = env.get('DB_NAME', 'ottertune')
db_host = env.get('DB_HOST', 'localhost') db_host = env.get('DB_HOST', 'localhost')
@ -41,3 +42,4 @@ DEBUG = debug
ADMINS = () ADMINS = ()
MANAGERS = ADMINS MANAGERS = ADMINS
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
BROKER_URL = 'amqp://guest:guest@{}:5672//'.format(rabbitmq_host)

1
docker/docker-compose.up.yml
View File

@ -25,6 +25,7 @@ services:
DB_PORT: '5432' DB_PORT: '5432'
DB_OPTS: '{}' DB_OPTS: '{}'
MAX_DB_CONN_ATTEMPTS: 30 MAX_DB_CONN_ATTEMPTS: 30
RABBITMQ_HOST: 'rabbitmq'
working_dir: /app/website working_dir: /app/website
entrypoint: ./start.sh entrypoint: ./start.sh
labels: labels: