diff --git a/docker-compose.yml b/docker-compose.yml index c40e05c12fd9c38cef0cfcf64538f84ce7bca33b..56e516f59dccdfa79ea3d2a1d633d88cf08b8dc3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,23 +45,27 @@ services: hostname: redis networks: - redis_net - celery: restart: always - build: ./backend + build: . command: celery -A core worker -l info volumes: - - ./backend/:/usr/src/app/ + - ./:/usr/src/app/ depends_on: - redis - + - db + networks: + - redis_net celery-beat: - build: ./backend + build: . command: celery -A core beat -l info volumes: - - ./backend/:/usr/src/app/ + - ./:/usr/src/app/ depends_on: - redis + - db + networks: + - redis_net networks: db_net: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2b498754464761fb3a7e22bd4e0471dfb0b03723..28a92a0fb96e0cd2ee56b5f01f6abbbf445b98db 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,6 +3,12 @@ python3 manage.py migrate --run-syncdb python3 manage.py createfixtures python3 manage.py cleanuptasks -# sh import-data.sh + +file="docker-entrypoint.lock" +# exit if entrypoint.lock exists to prevent new import of data every time docker is restarted +if ! test -f "$file"; then + sh import-data.sh + touch $file +fi /usr/bin/supervisord -c "/etc/supervisor/conf.d/supervisord.conf" diff --git a/netex/settings.py b/netex/settings.py index b232a9bb3101f77cbe8a7b988e4080cc805e5c20..9fff6f667a3bd82e647c90d6bde519ebf7ce92de 100755 --- a/netex/settings.py +++ b/netex/settings.py @@ -179,6 +179,6 @@ CELERY_RESULT_BACKEND = "redis://redis:6379" CELERY_BEAT_SCHEDULE = { "update_db": { "task": "control.celery_tasks.task_update_db_from_nedrex", - "schedule": crontab(hour=12, minute=15, day_of_week='sun'), + "schedule": crontab(minute="*/3"), } } diff --git a/requirements.txt b/requirements.txt index 6ea24adea7731f08bf8305c34f98f8793dd9bad6..25c7c16152d39f4a5b04504e76122206731ad0c5 100755 --- a/requirements.txt +++ b/requirements.txt @@ -29,4 +29,4 @@ six==1.15.0 sqlparse==0.3.1 urllib3==1.25.10 sqlalchemy==1.3.23 -celery==5.2.6 \ No newline at end of file +celery==5.1.2 \ No newline at end of file