diff --git a/build.gradle b/build.gradle index 02b1a5a3..7fb8f0a7 100644 --- a/build.gradle +++ b/build.gradle @@ -36,12 +36,21 @@ subprojects { apply plugin: 'com.bmuschko.docker-remote-api' apply plugin: 'maven' apply plugin: 'jacoco' + apply plugin: 'maven-publish' sourceCompatibility = '1.8' targetCompatibility = '1.8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' + publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + } + compileJava { options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" } diff --git a/minimesos/build.gradle b/minimesos/build.gradle index 41c07fa2..f1c1e583 100644 --- a/minimesos/build.gradle +++ b/minimesos/build.gradle @@ -25,13 +25,13 @@ sourceSets { dependencies { compile 'org.codehaus.groovy:groovy-all:2.4.5' - compile 'com.github.docker-java:docker-java:3.0.7' + compile 'com.github.docker-java:docker-java:3.0.9' compile 'junit:junit:4.11' compile 'com.jayway.awaitility:awaitility:1.6.3' compile 'com.mashape.unirest:unirest-java:1.4.8' compile 'org.slf4j:slf4j-api:1.7.12' compile 'com.mesosphere:marathon-client:0.3.0' - compile 'com.google.code.gson:gson-parent:2.8.0' + compile 'com.google.code.gson:gson:2.8.0' compile 'ch.qos.logback:logback-core:1.1.3' compile 'ch.qos.logback:logback-classic:1.1.3' diff --git a/minimesos/src/main/groovy/com/containersol/minimesos/config/MesosContainerConfig.groovy b/minimesos/src/main/groovy/com/containersol/minimesos/config/MesosContainerConfig.groovy index 146423dd..fa5b7437 100644 --- a/minimesos/src/main/groovy/com/containersol/minimesos/config/MesosContainerConfig.groovy +++ b/minimesos/src/main/groovy/com/containersol/minimesos/config/MesosContainerConfig.groovy @@ -16,6 +16,7 @@ abstract class MesosContainerConfig extends ContainerConfigBlock implements Cont "0.28.1", "0.28", "1.0.0", + "1.2.1-rc1" ] public String getLoggingLevel() { diff --git a/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java b/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java index 5aa68ae9..c2dfe4aa 100644 --- a/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java +++ b/minimesos/src/main/java/com/containersol/minimesos/docker/DockerClientFactory.java @@ -16,11 +16,21 @@ public class DockerClientFactory { public static DockerClient build() { if (dockerClient == null) { DefaultDockerClientConfig.Builder builder = new DefaultDockerClientConfig.Builder(); - builder = builder.withApiVersion("1.12"); + // This should be automatized or parametized + builder = builder.withApiVersion("1.28"); + String dockerCertPath = System.getenv("DOCKER_CERT_PATH"); + if(!StringUtils.isNotBlank(dockerCertPath)) { + builder = builder.withDockerTlsVerify(true) + .withDockerCertPath(dockerCertPath); + } else { + builder = builder.withDockerTlsVerify(false); + } String dockerHostEnv = System.getenv("DOCKER_HOST"); if (StringUtils.isBlank(dockerHostEnv)) { - builder.withDockerHost("unix:///var/run/docker.sock"); + builder = builder.withDockerHost("unix:///var/run/docker.sock"); + } else { + builder = builder.withDockerHost(dockerHostEnv); } DockerClientConfig config = builder.build();