Add option to reuse existing host config on start

Sean Fitts · Sean Fitts · commit 8e44173eda29 · 2014-11-17T14:25:46.000-08:00
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -113,6 +113,20 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 	 * "CHOWN" prevents the container from changing the owner of any files.
 	 */
 	public StartContainerCmd withCapDrop(String... capDrop);
+	
+	/**
+	 * Perform the start using the existing host configuration for the container.
+	 * 
+	 * @param withExisting <code>true</code> if the container's existing configuration should be used.
+	 * 
+	 * @return
+	 */
+	public StartContainerCmd withExistingConfig(boolean withExisting);
+	
+	/**
+	 * @return <code>true</code> if the container should use its existing configuration.
+	 */
+	public boolean useExistingConfig();
 
 	/**
 	 * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -66,6 +66,9 @@ public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Voi
 	@JsonProperty("CapDrop")
 	private String[] capDrop;
 	
+	@JsonIgnore
+	private boolean useExistingConfig = false;
+	
 	public StartContainerCmdImpl(StartContainerCmd.Exec exec, String containerId) {
 		super(exec);
 		withContainerId(containerId);
@@ -255,6 +258,17 @@ public StartContainerCmd withCapDrop(String... capDrop) {
 		this.capDrop = capDrop;
 		return this;
 	}
+    
+    @Override
+    public StartContainerCmd withExistingConfig(boolean useExisting) {
+        this.useExistingConfig = useExisting;
+        return this;
+    }
+
+    @Override
+    public boolean useExistingConfig() {
+        return this.useExistingConfig;
+    }
 
 	@Override
 	public String toString() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs1/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs1/StartContainerCmdExec.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.BadRequestException;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
 
 public class StartContainerCmdExec extends AbstrDockerCmdExec<StartContainerCmd, Void> implements StartContainerCmd.Exec {
 
@@ -27,19 +28,20 @@ protected Void execute(StartContainerCmd command) {
 		        .resolveTemplate("/containers/{id}/start", command.getContainerId())
 		        .build();
 
-		// Workaround for Docker issue 6231.  This avoids the use of chunked encoding.
-		ObjectMapper mapper = new ObjectMapper();
-		ByteArrayInputStream bais;
-        try {
-            bais = new ByteArrayInputStream(mapper.writeValueAsBytes(command));
-        } catch (JsonProcessingException jpe) {
-            throw new BadRequestException("Unable to serialize start command", jpe);
-        }
+		Builder builder = webResource.accept(MediaType.APPLICATION_JSON);
+		if (!command.useExistingConfig()) {
+	        // Workaround for Docker issue 6231.  This avoids the use of chunked encoding.
+	        ObjectMapper mapper = new ObjectMapper();
+	        ByteArrayInputStream bais;
+	        try {
+	            bais = new ByteArrayInputStream(mapper.writeValueAsBytes(command));
+	        } catch (JsonProcessingException jpe) {
+	            throw new BadRequestException("Unable to serialize start command", jpe);
+	        }
+		    builder = builder.entity(bais, MediaType.APPLICATION_JSON);
+		}
 		LOGGER.trace("POST: {}", webResource);
-		webResource.accept(MediaType.APPLICATION_JSON)
-		    .entity(bais, MediaType.APPLICATION_JSON)
-		    .post();
-
+		builder.post();
 		return null;
 	}
 
