Feat/update compose container #9871
Open
Conversation
This file contains 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
…propriate docker image in the ComposeContainer.
…ion of docker and update the constructors
…vVarOrUserProperty checking if the value is not empty
fokion
force-pushed
the
feat/update-compose-container
branch
from
3ae5baa to
10d6485
Compare
eddumelendez
requested changes
Feb 6, 2025
| @@ -61,36 +62,74 @@ public class ComposeContainer extends FailureDetectingExternalResource implement | |||
|
|
|||
| public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker"; | |||
|
|
|||
| private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker:24.0.2"); | |||
| private static final String DEFAULT_DOCKER_IMAGE = "docker:27.5.0"; | |||
There was a problem hiding this comment.
Do not override default image.
Comment on lines
127
to
132
| public static DockerImageName getDockerImageName() { | ||
| return DockerImageName.parse( | ||
| TestcontainersConfiguration | ||
| .getInstance() | ||
| .getEnvVarOrUserProperty("compose.container.image", DEFAULT_DOCKER_IMAGE) | ||
| ); |
There was a problem hiding this comment.
This is a deprecated way to do it and given we are offering a new constructor to set the image, this doesn't apply anymore.
fokion
force-pushed
the
feat/update-compose-container
branch
from
45b2894 to
2dd3b3d
Compare
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.
In the #9222 a user is specifying a property with the field name
compose.container.imageand theComposeContainerwhen it creates thecomposeDelegatevariable is always picking the24.0.2version of docker. The change that I am proposing is to use theTestcontainersConfigurationin order to parse the propertycompose.container.imageif it exists otherwise continue as it was in the past. Updated the constructors based on the feedback.