You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/04/16 19:12:08 UTC
camel git commit: Resolve CAMEL-8648 Update Docker-java version from
0.10.5 to 1.2.0
Repository: camel
Updated Branches:
refs/heads/master ca1aaa1b2 -> f4e40c8ed
Resolve CAMEL-8648 Update Docker-java version from 0.10.5 to 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4e40c8e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4e40c8e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4e40c8e
Branch: refs/heads/master
Commit: f4e40c8edda3251dc377cef99216516289cd6857
Parents: ca1aaa1
Author: ancosen <an...@gmail.com>
Authored: Thu Apr 16 17:59:26 2015 +0200
Committer: ancosen <an...@gmail.com>
Committed: Thu Apr 16 17:59:26 2015 +0200
----------------------------------------------------------------------
.../apache/camel/component/docker/producer/DockerProducer.java | 4 +++-
.../component/docker/headers/CreateContainerCmdHeaderTest.java | 4 +++-
parent/pom.xml | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f4e40c8e/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
index 9512145..e01aaed 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
@@ -67,6 +67,8 @@ import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.RestartPolicy;
import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.Volumes;
+import com.github.dockerjava.api.model.VolumesFrom;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.docker.DockerClientFactory;
@@ -991,7 +993,7 @@ public class DockerProducer extends DefaultProducer {
createContainerCmd.withVolumes(volume);
}
- String[] volumesFrom = DockerHelper.parseDelimitedStringHeader(DockerConstants.DOCKER_VOLUMES_FROM, message);
+ VolumesFrom[] volumesFrom = DockerHelper.getArrayProperty(DockerConstants.DOCKER_VOLUMES_FROM, message, VolumesFrom.class);
if (volumesFrom != null) {
createContainerCmd.withVolumesFrom(volumesFrom);
http://git-wip-us.apache.org/repos/asf/camel/blob/f4e40c8e/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
index 388f370..aa6957f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
@@ -23,6 +23,8 @@ import com.github.dockerjava.api.model.Capability;
import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumesFrom;
+
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
@@ -59,7 +61,7 @@ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateCon
Long swapMemory = 512L;
Integer cpuShares = 512;
Volume volumes = new Volume("/example");
- String volumesFromContainer = "container2";
+ VolumesFrom volumesFromContainer = new VolumesFrom("/etc");
String env = "FOO=bar";
String cmd = "whoami";
HostConfig hostConfig = new HostConfig();
http://git-wip-us.apache.org/repos/asf/camel/blob/f4e40c8e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 54c764e..c07214b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -131,7 +131,7 @@
<disruptor-version>3.3.2</disruptor-version>
<dnsjava-version>2.1.6</dnsjava-version>
<dnsjava-bundle-version>2.1.6_1</dnsjava-bundle-version>
- <docker-java-version>0.10.5</docker-java-version>
+ <docker-java-version>1.2.0</docker-java-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>5.5.1</dozer-version>
<drools-version>6.2.0.Final</drools-version>