Fix DockerComposeContainer to support compose files from different directories#11925
Open
snehal242005 wants to merge 1 commit into
Open
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
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.
Closes #1863
What does this PR do?
DockerComposeContainer(containerized mode) previously determined the workingdirectory / root for docker-compose using only the first compose file's parent
directory. When additional compose files lived in a different directory, that
directory was never copied into the container, causing a FileNotFoundError.
This PR:
PathUtils.findCommonParent(List<File>), which computes the closestcommon ancestor directory of all provided compose files.
ContainerisedDockerComposeto use this common parent as the rootdirectory that gets copied into the container, instead of just the first
file's directory — ensuring every provided compose file is reachable.
withCopyFilesInContainerwas used, onlythe base compose file was copied into the container individually — other
compose files were silently dropped even in the same-directory case. All
compose files are now copied correctly.
common case) —
findCommonParentreduces to that same directory.How to test?
first/directory/docker-compose.ymlfirst/docker-compose.override.ymlDockerComposeContainerwith both filesstarts correctly.
Tests
Added
PathUtilsTest.javacovering:common parent
All 5 tests pass (
./gradlew :testcontainers:test --tests PathUtilsTest).Mandatory checks