Commit 5f1c96b5 authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Switching CoG to use supervisor.

parent f2d9c9af

cog/Dockerfile

+1 −3
Original line number Diff line number Diff line
@@ -88,9 +88,7 @@ VOLUME $COG_INSTALL_DIR 


# scripts

COPY scripts/ /usr/local/bin/



HEALTHCHECK CMD curl --fail "http://${ESGF_HOSTNAME}:8000/" || exit 1



COPY conf/cog.conf /etc/supervisor/conf.d/cog.conf

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

# override CMD options at run time

CMD ["localhost", "false", "true"]

cog/conf/cog.conf

0 → 100644
+7 −0
Original line number Diff line number Diff line 
[program:cog]

command=bash -c 'source "$COG_DIR/venv/bin/activate" && cd "$COG_INSTALL_DIR" && exec python ./manage.py runserver 0.0.0.0:8000'

stopsignal=KILL

killasgroup=true

stdout_logfile=/tmp/cog.log

stdout_logfile_maxbytes=0

redirect_stderr=true

cog/scripts/docker-entrypoint.sh

+4 −1
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ sed -i 's/PRODUCTION_SERVER = True/PRODUCTION_SERVER = False/g' $COG_CONFIG_DIR/ 
# start django server in virtual environment

# or keep the container running

if [ $RUNSERVER ]; then

   $RUNSERVER && python ./manage.py runserver 0.0.0.0:8000

   # start supervisor --> cog

   supervisord -c /etc/supervisord.conf

   sleep 2

   tail -f /tmp/cog.log

else

   tail -f /dev/null

fi