Skip to content

Fix dependencies to support Docker for OSX. #677

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.

Sign up for GitHub

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

Closed
andyp1per wants to merge 2 commits into from
Closed

Fix dependencies to support Docker for OSX. #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc71576
Fix dependencies to support Docker for OSX.
Aug 23, 2016
5c22ea5
Parameterize version. Skip netty unix domain tests on non-Linux platf…
Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
<slf4j-api.version>1.7.21</slf4j-api.version>

<bouncycastle.version>1.54</bouncycastle.version>
<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
<guava.version>19.0</guava.version>

<!-- test dependencies -->
Expand All @@ -78,6 +77,7 @@
<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
<lambdaj.version>2.3.3</lambdaj.version>
<mockito.version>1.10.19</mockito.version>
<junixsocket.version>2.0.4</junixsocket.version>


<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
Expand Down Expand Up @@ -115,9 +115,26 @@
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>de.gesellix</groupId>
<artifactId>unix-socket-factory</artifactId>
<version>${unix-socket-factory.version}</version>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>${junixsocket.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-native-common</artifactId>
<version>${junixsocket.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
17 changes: 16 additions & 1 deletion src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.github.dockerjava.netty;

import java.util.Locale;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.SkipException;

import com.github.dockerjava.client.AbstractDockerClientTest;
import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.core.TestDockerCmdExecFactory;

public abstract class AbstractNettyDockerClientTest extends AbstractDockerClientTest {
Expand All @@ -12,6 +16,17 @@ public abstract class AbstractNettyDockerClientTest extends AbstractDockerClient

@Override
protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
return new TestDockerCmdExecFactory(new NettyDockerCmdExecFactory());


return new TestDockerCmdExecFactory(new NettyDockerCmdExecFactory() {
@Override
public void init(DockerClientConfig dockerClientConfig) {
if (dockerClientConfig.getDockerHost().getScheme().equals("unix")
&& !System.getProperty("os.name").toLowerCase(Locale.UK).trim().startsWith("linux")) {
throw new SkipException("unix domain sockets not supported on netty on non-linux hosts");
}
super.init(dockerClientConfig);
}
});
}
}