add docker cleanup to integration tests #2465
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gabeiglio
reviewed
Sep 12, 2025
| ifeq ($(KEEP_COMPOSE),1) | ||
| CLEANUP_COMMAND = echo "Keeping containers running for debugging (KEEP_COMPOSE=1)" | ||
| else | ||
| CLEANUP_COMMAND = docker compose -f dev/docker-compose-integration.yml down -v --remove-orphans 2>/dev/null || true |
There was a problem hiding this comment.
Do you think it could be worth while to also support both docker compose and docker-compose commands?
There was a problem hiding this comment.
Hey @gabeiglio, I'd say let's stay with compose v2 (docker compose) support, since the v1 (docker-compose) is EOL, and docker keeps an alias so old scripts continue to work already.
WDYT?
There was a problem hiding this comment.
I would not be in favor of supporting the EOL docker-compose
Fokko
approved these changes
Sep 15, 2025
kevinjqliu
approved these changes
Sep 16, 2025
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
related to #2425
Rationale for this change
This PR updates the Makefile's test-integration target to cleanup the docker containers by default. Also, adds a variable (
KEEP_COMPOSE) that can ignore the cleanup for development purposes. but the setupAre these changes tested?
yes
Are there any user-facing changes?
no