-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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 utility class to allow image names to be configured … #277
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
55 changes: 55 additions & 0 deletions
55
core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
package org.testcontainers.utility; | ||
|
||
import com.google.common.base.MoreObjects; | ||
import lombok.AccessLevel; | ||
import lombok.Data; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.net.URL; | ||
import java.util.Properties; | ||
|
||
/** | ||
* Provides a mechanism for fetching configuration/defaults from the classpath. | ||
*/ | ||
@Data | ||
@Slf4j @NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public class TestcontainersConfiguration { | ||
|
||
@Getter(lazy = true) | ||
private static final TestcontainersConfiguration instance = loadConfiguration(); | ||
|
||
private String ambassadorContainerImage = "richnorth/ambassador:latest"; | ||
private String vncRecordedContainerImage = "richnorth/vnc-recorder:latest"; | ||
|
||
private static TestcontainersConfiguration loadConfiguration() { | ||
final TestcontainersConfiguration config = new TestcontainersConfiguration(); | ||
|
||
ClassLoader loader = MoreObjects.firstNonNull( | ||
Thread.currentThread().getContextClassLoader(), | ||
TestcontainersConfiguration.class.getClassLoader()); | ||
final URL configOverrides = loader.getResource("testcontainers.properties"); | ||
if (configOverrides != null) { | ||
|
||
log.debug("Testcontainers configuration overrides will be loaded from {}", configOverrides); | ||
|
||
final Properties properties = new Properties(); | ||
try (final InputStream inputStream = configOverrides.openStream()) { | ||
properties.load(inputStream); | ||
|
||
config.ambassadorContainerImage = properties.getProperty("ambassador.container.image", config.ambassadorContainerImage); | ||
config.vncRecordedContainerImage = properties.getProperty("vncrecorder.container.image", config.vncRecordedContainerImage); | ||
|
||
log.debug("Testcontainers configuration overrides loaded from {}: {}", configOverrides, config); | ||
|
||
} catch (IOException e) { | ||
log.error("Testcontainers config override was found on classpath but could not be loaded", e); | ||
} | ||
} | ||
|
||
return config; | ||
} | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just realized that if file if present, it will override both properties. What if user will override
ambassador.container.image
, but notvncrecorder
? We probably should add a check for itThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it should be OK - this is why I provided the current value (default) as the 2nd, default, parameter to
properties.getProperty(...)
. The intention is that if the user only provides one property, the other stays the same.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oooops, sorry, missed that!