diff --git a/docker/Dockerfile b/docker/Dockerfile index efcb0aeb..8ecaa2c1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -153,8 +153,7 @@ EXPOSE 8000 VOLUME ["/app/media"] USER edrn WORKDIR /app -ENTRYPOINT ["/usr/bin/python3"] -CMD ["/usr/bin/gunicorn", "-c", "/app/gunicorn.conf.py"] +ENTRYPOINT ["/usr/bin/gunicorn"] HEALTHCHECK --interval=5m --timeout=2m --start-period=10m CMD /usr/bin/curl --fail --retry 6 --max-time 5 --retry-delay 10 --retry-max-time 60 http://127.0.0.1:8000/ || /bin/sh -c 'killall5 -TERM && (/bin/sleep 10; killall5 -KILL)' diff --git a/docker/gunicorn.conf.py b/docker/gunicorn.conf.py index 5dcaeabd..3b231573 100644 --- a/docker/gunicorn.conf.py +++ b/docker/gunicorn.conf.py @@ -11,7 +11,13 @@ errorlog = '-' loglevel = 'debug' -workers = multiprocessing.cpu_count() * 2 + 1 +# DO NOT ENABLE THIS LINE: +# workers = multiprocessing.cpu_count() * 2 + 1 +# WHY? +# IT COMPLETELY MESSES UP django_plotly_dash! + + + # threads = # worker_class = 'gevent' # TODO: test this out diff --git a/src/edrnsite.content/setup.cfg b/src/edrnsite.content/setup.cfg index 5843c350..8cddb48b 100644 --- a/src/edrnsite.content/setup.cfg +++ b/src/edrnsite.content/setup.cfg @@ -24,7 +24,7 @@ install_requires = wagtail-django-recaptcha ~= 1.0 django-recaptcha ~= 3.0.0 gdown ~= 4.7.1 - pandas ~= 1.5.3 # Must match py3-pandas package in Dockerfile + pandas == 1.5.3 # Must match py3-pandas package in Dockerfile # A couple of the forms in this package actually depend on eke.knowledge, but eke.knowledge depends on diff --git a/src/edrnsite.policy/src/edrnsite/policy/VERSION.txt b/src/edrnsite.policy/src/edrnsite/policy/VERSION.txt index 954ea495..cd8864fb 100644 --- a/src/edrnsite.policy/src/edrnsite/policy/VERSION.txt +++ b/src/edrnsite.policy/src/edrnsite/policy/VERSION.txt @@ -1 +1 @@ -6.16.1 +6.16.2 diff --git a/src/edrnsite.policy/src/edrnsite/policy/settings/ops.py b/src/edrnsite.policy/src/edrnsite/policy/settings/ops.py index 6eaee9ec..6142b411 100644 --- a/src/edrnsite.policy/src/edrnsite/policy/settings/ops.py +++ b/src/edrnsite.policy/src/edrnsite/policy/settings/ops.py @@ -9,7 +9,7 @@ # Debug Mode # ---------- # -# This had better be off! TURN THIS BACK TO FALSE!!! +# This had better be off! # # 🔗 https://docs.djangoproject.com/en/3.2/ref/settings/#debug