diff --git a/compose.yml b/compose.yml index a2989bfdb..96031e99a 100644 --- a/compose.yml +++ b/compose.yml @@ -74,7 +74,7 @@ services: CONFIG_API_URL: '${CONFIG_API_URL:-http://grants-ui-config-api:3011}' CONFIG_API_JWT_SECRET: ${CONFIG_API_JWT_SECRET:-forms-config-jwt-secret} CONFIG_API_JWT_EXPIRY: ${CONFIG_API_JWT_EXPIRY:-1h} - FORMS_API_SLUGS: ${FORMS_API_SLUGS:-example-grant-with-auth} + FORMS_API_SLUGS: ${FORMS_API_SLUGS:-} FORMS_API_CACHE_TTL_SECONDS: ${FORMS_API_CACHE_TTL_SECONDS:-300} SFD_UPDATE_URL: '${SFD_UPDATE_URL:-http://localhost:3000/sfd/mock}' SFD_UPDATE_ENABLED: ${SFD_UPDATE_ENABLED:-false} diff --git a/tools/docker-compose-smoke-test.sh b/tools/docker-compose-smoke-test.sh index 06f502435..d38f2bdab 100755 --- a/tools/docker-compose-smoke-test.sh +++ b/tools/docker-compose-smoke-test.sh @@ -29,6 +29,8 @@ else fi COMPOSE_COMMAND='docker compose -f compose.yml -f compose.ha.yml -f compose.land-grants.yml -f compose.ci.yml' +echo "Running pre-emptive volume cleanse..." +docker volume prune -f echo "Building docker compose containers..." eval "${COMPOSE_COMMAND} build --quiet > /dev/null 2>&1" echo "Starting services with docker compose..." @@ -86,6 +88,6 @@ if [ -n "${PERFORMANCE_TESTS_HOOK:-}" ]; then eval "${PERFORMANCE_TESTS_HOOK}" fi -eval "${COMPOSE_COMMAND} down" +eval "${COMPOSE_COMMAND} down -v" echo "" echo "Tests complete." diff --git a/tools/run-acceptance-tests.sh b/tools/run-acceptance-tests.sh index bb2552e32..740c02018 100755 --- a/tools/run-acceptance-tests.sh +++ b/tools/run-acceptance-tests.sh @@ -19,7 +19,7 @@ export ACCEPTANCE_TESTS_HOOK=" docker compose -f compose.tests.yml run --quiet-pull --rm grants-ui-acceptance-tests $TEST_COMMAND && docker compose -f compose.tests.yml run --quiet-pull --rm land-grants-journey-tests $TEST_COMMAND && docker compose -f compose.tests.yml run --quiet-pull --rm woodland-grant-journey-tests $TEST_COMMAND && - docker compose -f compose.tests.yml down + docker compose -f compose.tests.yml down -v " "$(dirname "$0")/docker-compose-smoke-test.sh"