diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cc79cbb1..88ab8483e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ The types of changes are: * Fix issue with fideslog event loop errors [#1174](https://github.com/ethyca/fidesops/pull/1174) * Allow passwords to be sent either base64 encode or as plaintext. [#1236](https://github.com/ethyca/fidesops/pull/1236) +* Allow worker to start up successfully for dev and dev_with_worker nox commands [#1250](https://github.com/ethyca/fidesops/pull/1250) ## [1.7.2](https://github.com/ethyca/fidesops/compare/1.7.1...1.7.2) diff --git a/docker-compose.yml b/docker-compose.yml index 3ba72451f..820c50d6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,6 @@ services: - FIDESOPS__LOG_PII=${FIDESOPS__LOG_PII} - FIDESOPS__HOT_RELOAD=${FIDESOPS__HOT_RELOAD} - FIDESOPS__ROOT_USER__ANALYTICS_ID=${FIDESOPS__ROOT_USER__ANALYTICS_ID} - - FIDESOPS__EXECUTION__WORKER_ENABLED=True db: image: postgres:12 diff --git a/noxfiles/dev_nox.py b/noxfiles/dev_nox.py index 0ae31559c..227a2e8d7 100644 --- a/noxfiles/dev_nox.py +++ b/noxfiles/dev_nox.py @@ -29,10 +29,10 @@ def dev(session: nox.Session) -> None: @nox.session() def dev_with_worker(session: nox.Session) -> None: - """Spin up the entire application and open a development shell.""" + """Spin up the entire application with the celery worker in a separate container.""" build(session, "dev") session.notify("teardown") - session.run("docker-compose", "up", "worker", "--wait", external=True) + session.run("docker-compose", "up", "--detach", "worker", external=True) session.run( "docker-compose", "run",