Skip to content

Commit

Permalink
Another attempt to bring the graphs back when running in Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
nutjob4life committed Nov 20, 2024
1 parent 7b618ac commit 1269ebb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
3 changes: 1 addition & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)'


Expand Down
8 changes: 7 additions & 1 deletion docker/gunicorn.conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/edrnsite.content/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/edrnsite.policy/src/edrnsite/policy/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.16.1
6.16.2
2 changes: 1 addition & 1 deletion src/edrnsite.policy/src/edrnsite/policy/settings/ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 1269ebb

Please sign in to comment.