Skip to content

Added a -v flag to docker compose down commands to ensure that volu… #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidBarker-EE merged 5 commits into from
Apr 30, 2026
+5 −3
Merged

Added a -v flag to docker compose down commands to ensure that volu… #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
592ce66
Added a `-v` flag to docker compose down commands to ensure that volu…
DavidBarker-EE Apr 30, 2026
bcda3a8
Added a `docker volume prune -f` belts and braces to ensure a clean e…
DavidBarker-EE Apr 30, 2026
031f74e
Removed the volume prune flag from `npm run docker:down`
DavidBarker-EE Apr 30, 2026
7d51b5b
Moved the volume cleanse before the `docker up` commands
DavidBarker-EE Apr 30, 2026
ede6abe
Removed the default value for "FORMS_API_SLUGS" in docker compose
DavidBarker-EE Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 3 additions & 1 deletion tools/docker-compose-smoke-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down Expand Up @@ -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."
2 changes: 1 addition & 1 deletion tools/run-acceptance-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading