diff --git a/Dockerfile b/Dockerfile index 7067a7b..0784495 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,8 @@ RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/p pyenv global ${PYTHON_VERSION} && \ pip install tornado pyzmq transitions +ENV TFW_WEB_PORT=4242 +EXPOSE ${TFW_WEB_PORT} ENV TFW_APP_DIR="/srv/app" COPY src/app ${TFW_APP_DIR} @@ -39,7 +41,5 @@ ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" ENV TFW_SUPERVISOR_HTTP_PORT=9001 COPY supervisord.conf ${TFW_SUPERVISORD_CONF} -ENV WEB_PORT=4242 -EXPOSE ${WEB_PORT} CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon diff --git a/lib/config/envvars.py b/lib/config/envvars.py index 19c27b8..7e11869 100644 --- a/lib/config/envvars.py +++ b/lib/config/envvars.py @@ -2,7 +2,7 @@ import os PUBLISHER_PORT = os.getenv('PUBLISHER_PORT', 7654) RECEIVER_PORT = os.getenv('RECEIVER_PORT', 8765) -WEB_PORT = os.getenv('WEB_PORT', 4242) +WEB_PORT = os.getenv('TFW_WEB_PORT', 4242) SUPERVISOR_HTTP_PORT = os.getenv('TFW_SUPERVISOR_PORT', 9001) LOGIN_APP_PORT= os.getenv('TFW_LOGIN_APP_PORT', 6666)