Samuel Clay d3449db1ec Merge branch 'docker_django3.1' into dashboard3 ... * docker_django3.1: add swarm_instructions.sh update celery task name to cron_queue in settings.py.orig change redis port to 6579 in docker local settings update celery task name to cron_queue in settings.py add image building and deployment functionality to Makefile update docker files to include code in the image so we can use with swarm (without configuring shared volumes yet) change beat_tasks to cron_queue in config/supervision_celeryd_beat.conf change pymysql version in __init__ to the new django compatible version change names for swarm service in swarm haproxy.conf file remove ssl from nginx fix dependency issues change nginx check time in haproxy add .dockerignore update newsblur dir to newsblur_web in code adjust resource limits on containers in stack-compose and correct monitor command clean up and fix stack-compose.yml file correct docker-compose images		2021-01-23 19:31:06 -05:00
..
__init__.py	Merge branch 'docker_django3.1' into dashboard3	2021-01-23 19:31:06 -05:00
assets.yml	Merge branch 'master' into docker_django3.1	2021-01-05 19:12:19 -05:00
celeryapp.py	Fixing celery issues.	2021-01-19 18:00:10 -05:00
docker_local_settings.py	change redis port to 6579 in docker local settings	2021-01-19 09:55:49 -05:00
local_settings.py.template	remove use of ORIGINAL_PAGE_SERVER	2021-01-03 11:09:25 -05:00
settings.py	Merge branch 'docker_django3.1' into dashboard3	2021-01-23 19:31:06 -05:00
settings.py.orig	update celery task name to cron_queue in settings.py.orig	2021-01-19 09:56:55 -05:00
sitecustomize.py	use newsblur_web instead of newsblur as directory name	2020-10-13 22:02:55 +07:00
test_settings.py	add db configs to test settings and custom installed_apps for test_settings.py	2020-11-19 11:50:45 -05:00
urls.py	use newsblur_web instead of newsblur as directory name	2020-10-13 22:02:55 +07:00
wsgi.py	use newsblur_web instead of newsblur as directory name	2020-10-13 22:02:55 +07:00