-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
1.1 #167
Merged
1.1 #167
Changes from all commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
fab4ef8
Refactor to use the docker-java v3 with Netty support
rnorth 249593b
Introduce a wait period between JDBC connection checks to avoid heavy…
rnorth 53e14cc
Ignore a flapping test
rnorth 5619c77
Update to release version of docker-java (3.0.0)
rnorth 991873b
Reduce log noise
rnorth 0fab0af
Workaround for SeleniumHQ/docker-selenium#227
rnorth 0c4930d
Make ContainerReaper more intelligent about not trying to kill stoppe…
rnorth db230d9
Refactor ProxiedUnixSocketConfigurationStrategy and UnixSocketConfigu…
rnorth bf946c9
Switch Docker Compose tests to use Jedis rather than Redisson to avoi…
rnorth 9246d6c
Tidy up Slf4jLogConsumer output to reduce duplicate whitespace
rnorth bc41218
Prevent NullPointerException at the end of container output when pipi…
rnorth 68fb35f
Reduce log level for container reaper success messages
rnorth 3478853
Add extra debugging logs to help diagnose any future docker daemon co…
rnorth 5b5d32b
Ensure that linked containers are added to the same network as the co…
rnorth a933421
Add automated test for passing environment variables through to a doc…
rnorth cfe1eb2
Add cleanup of networks created by docker-compose
rnorth eb75a90
Make linked container identification compatible with container names …
rnorth fafde15
Change to client factory code to use netty command factory
rnorth 7a7c930
Remove profiler logs from build output
rnorth 8adca92
Add logging of Docker API version for diagnostics
rnorth db4c79c
Fix NPE in DockerMachineClientProviderStrategy due to not retaining s…
rnorth 2846ec8
Implement smarter options for specifying compose service index as per…
rnorth f08f887
Add test to make sure that an invalid docker-compose file causes a fa…
rnorth 2a9453d
Remove container startup retries. Testing indicates that this is no l…
rnorth 18aa341
Speed up HostPortWaitStrategyTest expected failure
rnorth c48f7ae
Relax unix socket validation code by using bitmasking rather than a s…
rnorth f2d2188
General code/javadocs cleanup
rnorth 3f5d716
Add mechanism for ignoring some tests in environments that do not sup…
rnorth 8403cd9
Update docs to add compatibility table
rnorth 0a44d07
Incorporate alpha Windows support into main v1.1 release candidate br…
rnorth c132aa4
Update docs to reflect merging of Windows support
rnorth a651031
Fix failure to skip Docker-compose related tests on CircleCI
rnorth 4ebf461
Skip test execution for LocalServerWebDriverContainerTest when not us…
rnorth 1b99dc4
Merge pull request #162 from locationlabs/use_getContainerIpAddress
rnorth 9c57f9f
Add null guards for container networks (workaround for NPE on CircleC…
rnorth 64d3451
Add custom Redis wait strategy as an example and to mitigate #160
rnorth 0ea18cb
Add extra waits for Redis startup in docker compose tests
rnorth 68f6488
Add Javadocs and unit tests for `withNetworkMode` option
rnorth 36a1b6f
Set shade to relocate `jersey.repackaged` classes to address #161
rnorth 57ecdf2
Update docker-compose container image to dduportal/docker-compose:1.7.1
rnorth 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<root> | ||
<item name='com.google.common.base.Preconditions void checkArgument(boolean, java.lang.Object)'> | ||
<annotation name='org.jetbrains.annotations.Contract'> | ||
<val val=""false, _ -> fail; true, _ -> _""/> | ||
</annotation> | ||
</item> | ||
</root> |
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,7 @@ | ||
<root> | ||
<item name='org.rnorth.ducttape.Preconditions void check(java.lang.String, boolean)'> | ||
<annotation name='org.jetbrains.annotations.Contract'> | ||
<val val=""_,true->_;_,false->fail""/> | ||
</annotation> | ||
</item> | ||
</root> |
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 |
---|---|---|
@@ -1,5 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<parent> | ||
|
@@ -17,8 +18,22 @@ | |
<dependency> | ||
<groupId>com.github.docker-java</groupId> | ||
<artifactId>docker-java</artifactId> | ||
<version>2.2.0</version> | ||
<version>3.0.0</version> | ||
<exclusions> | ||
<!-- replace with junixsocket --> | ||
<exclusion> | ||
<groupId>de.gesellix</groupId> | ||
<artifactId>unix-socket-factory</artifactId> | ||
</exclusion> | ||
</exclusions> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.rnorth</groupId> | ||
<artifactId>tcp-unix-socket-proxy</artifactId> | ||
<version>1.0.1</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.zeroturnaround</groupId> | ||
<artifactId>zt-exec</artifactId> | ||
|
@@ -37,9 +52,9 @@ | |
|
||
<!-- Test dependencies --> | ||
<dependency> | ||
<groupId>org.redisson</groupId> | ||
<artifactId>redisson</artifactId> | ||
<version>1.3.0</version> | ||
<groupId>redis.clients</groupId> | ||
<artifactId>jedis</artifactId> | ||
<version>2.8.0</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
|
@@ -69,6 +84,13 @@ | |
|
||
</dependencies> | ||
|
||
<!-- Prevent netty version conflicts with redisson, used for testing --> | ||
<dependencyManagement> | ||
<dependencies> | ||
|
||
</dependencies> | ||
</dependencyManagement> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
|
@@ -84,8 +106,10 @@ | |
</executions> | ||
<configuration> | ||
<transformers> | ||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" /> | ||
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
<transformer | ||
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/> | ||
<transformer | ||
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> | ||
</transformers> | ||
<relocations> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Still need to add netty relocation |
||
<relocation> | ||
|
@@ -120,6 +144,10 @@ | |
<pattern>com.github.dockerjava</pattern> | ||
<shadedPattern>org.testcontainers.shaded.com.github.dockerjava</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>jersey.repackaged</pattern> | ||
<shadedPattern>org.testcontainers.shaded.jersey.repackaged</shadedPattern> | ||
</relocation> | ||
</relocations> | ||
<artifactSet> | ||
<includes> | ||
|
@@ -141,7 +169,7 @@ | |
<exclude>META-INF/*.SF</exclude> | ||
<exclude>META-INF/*.DSA</exclude> | ||
<exclude>META-INF/*.RSA</exclude> | ||
<exclude>META-INF/services/com.fasterxml.jackson.core.*</exclude> | ||
<exclude>META-INF/services/com.fasterxml.jackson.core.*</exclude> | ||
<exclude>META-INF/services/com.github.dockerjava.api.command.*</exclude> | ||
<exclude>META-INF/services/javax.ws.rs.ext.*</exclude> | ||
<exclude>META-INF/services/org.glassfish.hk2.extension.*</exclude> | ||
|
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
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
Oops, something went wrong.
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.
Until netty and/or docker-java have native support for unix domain sockets, use a slightly hacky but effective workaround of proxying over TCP. For Testcontainers' purposes, there's no perceptible performance impact.