diff --git a/.gitignore b/.gitignore index 95bf57b..8091202 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea .cache +.packit_identity celerybeat-schedule /*/__pycache__/ /*/*/__pycache__/ diff --git a/scripts/run-dependencies.sh b/scripts/run-dependencies.sh index 717eb98..1543e83 100755 --- a/scripts/run-dependencies.sh +++ b/scripts/run-dependencies.sh @@ -38,11 +38,8 @@ $here/montagu_cli.sh addRole test.user user # Run packit hatch env run pip3 install constellation hatch env run pip3 install packit-deploy -# For some reason packit is emitting exit code 1 despite apparently succeeding. Allow this for now... -set +e -hatch env run -- packit start --pull $here -echo Packit deployed with exit code $? -set -e +hatch env run packit configure $here +hatch env run -- packit start --pull docker exec montagu-packit-db wait-for-db diff --git a/scripts/run-dev-dependencies.sh b/scripts/run-dev-dependencies.sh index c257232..fd079d5 100755 --- a/scripts/run-dev-dependencies.sh +++ b/scripts/run-dev-dependencies.sh @@ -7,10 +7,7 @@ set -ex function cleanup() { docker container stop reverse-proxy docker container rm reverse-proxy -v - # Same exit code issue for packit stop as packit start.... - set +e - hatch env run -- packit stop ./scripts - set -e + hatch env run -- packit stop # remove db volume manually rather than --volumes flag to packit, to avoid requiring user confirmation docker volume rm montagu_packit_db montagu_orderly_library montagu_outpack_volume montagu_orderly_logs docker compose --project-name montagu down -v