Commit graph

6 commits

Author SHA1 Message Date
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
Samuel Clay
7fab5951fb Incorrect celery app import. 2021-01-19 18:01:17 -05:00
Samuel Clay
c3732d6d1c Fixing celery issues. 2021-01-19 18:00:10 -05:00
Jonathan Math
0933d3bb0a change pymysql version in __init__ to the new django compatible version 2021-01-19 09:45:32 -05:00
Jonathan Math
1f406bbb49 add nosetest, nosetest-exclude, and update Makefile 2020-10-27 16:24:34 +07:00
Jonathan Math
2c0fd0ee2e use newsblur_web instead of newsblur as directory name 2020-10-13 22:02:55 +07:00
Renamed from newsblur/__init__.py (Browse further)