Merge pull request docker-java#234 from KostyaSha/fixVolumes

marcuslinke · marcuslinke · commit 7728b79498a1 · 2015-05-30T10:11:52.000+02:00
Fix volumesFrom
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.VolumesFrom;
 
 /**
  * Start a container.
@@ -56,7 +57,7 @@ public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
 
 	public RestartPolicy getRestartPolicy();
 
-	public String getVolumesFrom();
+	public VolumesFrom[] getVolumesFrom();
 
 	public Boolean isPrivileged();
 
@@ -165,6 +166,6 @@ public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
 	public StartContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
 
 	@Deprecated
-	public StartContainerCmd withVolumesFrom(String volumesFrom);
+	public StartContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.VolumesFrom;
 
 
 /**
@@ -57,7 +58,7 @@ public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Voi
 	private String[] dnsSearch;
 
 	@JsonProperty("VolumesFrom")
-	private String volumesFrom;
+	private VolumesFrom[] volumesFrom;
 	
 	@JsonProperty("NetworkMode")          
     private String networkMode;
@@ -125,7 +126,7 @@ public String[] getDnsSearch() {
 	}
 
 	@Override
-	public String getVolumesFrom() {
+	public VolumesFrom[] getVolumesFrom() {
 		return volumesFrom;
 	}
 
@@ -232,7 +233,7 @@ public StartContainerCmd withDnsSearch(String... dnsSearch) {
 	}
 
 	@Override
-	public StartContainerCmd withVolumesFrom(String volumesFrom) {
+	public StartContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
 		checkNotNull(volumesFrom, "volumesFrom was not specified");
 		this.volumesFrom = volumesFrom;
 		return this;
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -126,7 +126,7 @@ public void startContainerWithVolumesFrom() throws DockerException {
 		LOG.info("Created container2 {}", container2.toString());
 
 		dockerClient.startContainerCmd(container2.getId())
-				.withVolumesFrom(container1Name).exec();
+				.withVolumesFrom(new VolumesFrom(container1Name)).exec();
 		LOG.info("Started container2 {}", container2.toString());
 
 		InspectContainerResponse inspectContainerResponse2 = dockerClient
