diff --git a/.gitignore b/.gitignore index 4ac22b2f4..2137ff1df 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ server_config.yaml .DS_Store .DS_Store? + +caddy_config/ +caddy_data/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 2a213b2fe..b80180df5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: django: build: . # NOTE: We use watchmedo to reload gunicorn nicely, Uvicorn + Gunicorn reloads don't work well - command: bash -c "cd /app/src && watchmedo auto-restart -p '*.py' --recursive -- gunicorn asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b :8000 -b :80 --capture-output --log-level debug" + command: bash -c "python manage.py collectstatic --noinput && cd /app/src && watchmedo auto-restart -p '*.py' --recursive -- gunicorn asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b :8000 -b :80 --capture-output --log-level debug" environment: - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME} env_file: .env