diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 06a437cb3..8ac32dc7a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -74,19 +74,17 @@ services: depends_on: - db - rabbitmq + build: + context: . env_file: .env environment: - CELERY_BROKER_URL - - DJANGO_SETTINGS_MODULE=di_website.settings.dev - build: - context: . - dockerfile: Dockerfile volumes: - ./:/code/ - ./config/celery/default:/etc/default - ./config/celery/init.d:/etc/init.d restart: always - command: celery -A wagtaillinkchecker worker -l info + command: celery -A di_website worker -l info volumes: diwebsite_db: diff --git a/docker-compose.yml b/docker-compose.yml index b5fa5e64c..9801d4496 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -111,7 +111,6 @@ services: - web - consul - certbot: container_name: certbot image: certbot/certbot:latest @@ -151,16 +150,17 @@ services: env_file: .env environment: - CELERY_BROKER_URL - - DJANGO_SETTINGS_MODULE=di_website.settings.dev build: context: . - dockerfile: Dockerfile volumes: - ./:/code/ - ./config/celery/default:/etc/default - ./config/celery/init.d:/etc/init.d restart: always - command: celery -A wagtaillinkchecker worker -l info + command: celery -A di_website worker -l info + networks: + - web + - consul volumes: diwebsite_db: diff --git a/requirements.txt b/requirements.txt index 81fbca7f9..57a1251c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ num2words==0.5.10 beautifulsoup4==4.8 bleach==3.3.0 elasticsearch>=7.0.0,<7.16.3 -wagtail-linkchecker==0.5.3 +wagtail-linkchecker==0.6.0 celery==4.4.7 wagtailgeowidget==5.0.2 xlrd>=1.0.0