Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Mar 14, 2023
2 parents 554e55d + 738e174 commit 908502b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 3 additions & 0 deletions docker-compose.override.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ services:
environment:
DEBUG: 1
command: python3 manage.py runserver 0.0.0.0:8000
depends_on:
- db
- redis

worker_wrapper:
scale: ${QFIELDCLOUD_WORKER_REPLICAS}
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ services:
ofelia.job-exec.runcrons.schedule: "@every 1m"
ofelia.job-exec.runcrons.command: python manage.py runcrons
depends_on:
- db
- redis

nginx:
Expand Down

0 comments on commit 908502b

Please sign in to comment.