Skip to content
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.

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

Add ability to override DockerClientFactory.TINY_IMAGE in testcontainers.properties #287

Merged
merged 2 commits into from
Feb 5, 2017

Conversation

dddpaul
Copy link

@dddpaul dddpaul commented Feb 3, 2017

This fixes #281.

@@ -42,6 +43,7 @@ private static TestcontainersConfiguration loadConfiguration() {

config.ambassadorContainerImage = properties.getProperty("ambassador.container.image", config.ambassadorContainerImage);
config.vncRecordedContainerImage = properties.getProperty("vncrecorder.container.image", config.vncRecordedContainerImage);
config.tinyImage = properties.getProperty("tinyimage.container.image", config.vncRecordedContainerImage);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default value is wrong. should be config. tinyImage

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, it's friday night :) Fixed.

@bsideup
Copy link
Member

bsideup commented Feb 3, 2017

LGTM

/cc @rnorth

@rnorth
Copy link
Member

rnorth commented Feb 5, 2017

Great! Thanks - this looks good to me. Will merge.

@rnorth rnorth merged commit d623ddc into testcontainers:master Feb 5, 2017
@bsideup bsideup added this to the 1.1.9 milestone Feb 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Strong coupling with "alpine:3.2" image in DockerClientFactory
3 participants