From 592ce660da139da8be6cc7e6adedbfdcee5cdc91 Mon Sep 17 00:00:00 2001 From: David Barker Date: Thu, 30 Apr 2026 14:51:41 +0100 Subject: [PATCH 1/5] Added a `-v` flag to docker compose down commands to ensure that volumes do not persist between acceptance test runs --- package.json | 2 +- tools/docker-compose-smoke-test.sh | 2 +- tools/run-acceptance-tests.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d3142fc6b..bb2cbbd7e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dev": "run-p frontend:watch server:watch", "dev:debug": "run-p frontend:watch server:debug", "docker:up": "docker compose up -d", - "docker:down": "docker compose down --remove-orphans", + "docker:down": "docker compose down --remove-orphans -v", "docker:debug": "node ./tools/docker-debug.js", "docker:cycle-ui": "docker compose up -d --force-recreate grants-ui", "docker:reset": "docker compose down --volumes --remove-orphans --rmi local && docker volume ls --format '{{.Name}}' | grep -E '^[a-f0-9]{64}$' | xargs docker volume rm", diff --git a/tools/docker-compose-smoke-test.sh b/tools/docker-compose-smoke-test.sh index 06f502435..255db1c5e 100755 --- a/tools/docker-compose-smoke-test.sh +++ b/tools/docker-compose-smoke-test.sh @@ -86,6 +86,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" From bcda3a858c9bed31b782e87e61f96c03512e72db Mon Sep 17 00:00:00 2001 From: David Barker Date: Thu, 30 Apr 2026 15:12:11 +0100 Subject: [PATCH 2/5] Added a `docker volume prune -f` belts and braces to ensure a clean environment on each run --- tools/docker-compose-smoke-test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/docker-compose-smoke-test.sh b/tools/docker-compose-smoke-test.sh index 255db1c5e..d9354cc3b 100755 --- a/tools/docker-compose-smoke-test.sh +++ b/tools/docker-compose-smoke-test.sh @@ -76,6 +76,9 @@ echo "All services are healthy!" echo "Service Status:" docker compose ps +echo "Running pre-emptive volume cleanse..." +docker volume prune -f + if [ -n "${ACCEPTANCE_TESTS_HOOK:-}" ]; then echo "Running Acceptance Tests..." eval "${ACCEPTANCE_TESTS_HOOK}" From 031f74e5b31db5c92a8ece5cecb4faaf65a28aa1 Mon Sep 17 00:00:00 2001 From: David Barker Date: Thu, 30 Apr 2026 15:14:31 +0100 Subject: [PATCH 3/5] Removed the volume prune flag from `npm run docker:down` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb2cbbd7e..d3142fc6b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dev": "run-p frontend:watch server:watch", "dev:debug": "run-p frontend:watch server:debug", "docker:up": "docker compose up -d", - "docker:down": "docker compose down --remove-orphans -v", + "docker:down": "docker compose down --remove-orphans", "docker:debug": "node ./tools/docker-debug.js", "docker:cycle-ui": "docker compose up -d --force-recreate grants-ui", "docker:reset": "docker compose down --volumes --remove-orphans --rmi local && docker volume ls --format '{{.Name}}' | grep -E '^[a-f0-9]{64}$' | xargs docker volume rm", From 7d51b5baeb9fc12936f97ae21a7cccef0d811720 Mon Sep 17 00:00:00 2001 From: David Barker Date: Thu, 30 Apr 2026 15:20:36 +0100 Subject: [PATCH 4/5] Moved the volume cleanse before the `docker up` commands --- tools/docker-compose-smoke-test.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/docker-compose-smoke-test.sh b/tools/docker-compose-smoke-test.sh index d9354cc3b..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..." @@ -76,9 +78,6 @@ echo "All services are healthy!" echo "Service Status:" docker compose ps -echo "Running pre-emptive volume cleanse..." -docker volume prune -f - if [ -n "${ACCEPTANCE_TESTS_HOOK:-}" ]; then echo "Running Acceptance Tests..." eval "${ACCEPTANCE_TESTS_HOOK}" From ede6abee1ce99b1404fd4a06587d358563e0e80c Mon Sep 17 00:00:00 2001 From: David Barker Date: Thu, 30 Apr 2026 16:52:35 +0100 Subject: [PATCH 5/5] Removed the default value for "FORMS_API_SLUGS" in docker compose --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}