mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-22 20:01:33 +00:00
Code Issues Releases Wiki Activity

Split supervisor configuration to several files

Browse Source
This commit is contained in:
Kristóf Tóth 2018-01-31 17:02:45 +01:00
parent fde26fb0c8
commit 0ec79fe8d0
5 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -57,9 +57,16 @@ ENV TFW_TERMINADO_DIR="/tmp/terminado_server"
ENV TFW_TERMINADO_WD="/home/${AVATAO_USER}" ENV TFW_TERMINADO_WD="/home/${AVATAO_USER}"
ENV TFW_LIB_DIR="/usr/local/lib/" ENV TFW_LIB_DIR="/usr/local/lib/"
ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf"
ENV TFW_SUPERVISORD_COMPONENTS="/etc/supervisor/conf"
ENV PYTHONPATH=${TFW_LIB_DIR} ENV PYTHONPATH=${TFW_LIB_DIR}
COPY nginx /etc/nginx COPY nginx /etc/nginx
COPY lib ${TFW_LIB_DIR}
COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF}
COPY supervisor/components/ ${TFW_SUPERVISORD_COMPONENTS}
COPY src/app ${TFW_APP_DIR}
COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR}
RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx &&\ RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx &&\
# nginx runs as a regular user, and can't write to /run # nginx runs as a regular user, and can't write to /run
sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf &&\ sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf &&\
@ -69,9 +76,5 @@ RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \
USER ${AVATAO_USER} USER ${AVATAO_USER}
WORKDIR /home/${AVATAO_USER} WORKDIR /home/${AVATAO_USER}
COPY lib ${TFW_LIB_DIR}
COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF}
COPY src/app ${TFW_APP_DIR}
COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR}
CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon

3
supervisor/components/event_handlers.conf Normal file
View File

@ -0,0 +1,3 @@
[program:event_handler_main]
directory=%(ENV_TFW_EVENT_HANDLERS_DIR)s
command=env python event_handler_main.py

4
supervisor/components/login.conf Normal file
View File

@ -0,0 +1,4 @@
[program:login]
directory=%(ENV_TFW_LOGIN_APP_DIR)s
command=env python server.py
autostart=false

4
supervisor/components/terminado.conf Normal file
View File

@ -0,0 +1,4 @@
[program:terminado]
directory=%(ENV_TFW_TERMINADO_DIR)s
command=env python server.py
autostart=false

25
supervisor/supervisord.conf
View File

@ -13,25 +13,14 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl] [supervisorctl]
serverurl=http://127.0.0.1:%(ENV_TFW_SUPERVISOR_HTTP_PORT)s serverurl=http://127.0.0.1:%(ENV_TFW_SUPERVISOR_HTTP_PORT)s
[program:app]
directory=%(ENV_TFW_APP_DIR)s
command=env python app.py
[program:event_handler_main]
directory=%(ENV_TFW_EVENT_HANDLERS_DIR)s
command=env python event_handler_main.py
[program:login]
directory=%(ENV_TFW_LOGIN_APP_DIR)s
command=env python server.py
autostart=false
[program:terminado]
directory=%(ENV_TFW_TERMINADO_DIR)s
command=env python server.py
autostart=false
[program:nginx] [program:nginx]
command=/usr/sbin/nginx -g 'daemon off;' command=/usr/sbin/nginx -g 'daemon off;'
autostart=true autostart=true
autorestart=true autorestart=true
[program:app]
directory=%(ENV_TFW_APP_DIR)s
command=env python app.py
[include]
files=%(ENV_TFW_SUPERVISORD_COMPONENTS)s/*.conf