Merge branch 'master' of https://github.com/docker-java/docker-java

Marcus Linke · Marcus Linke · commit 43027ebbcb33 · 2014-07-15T20:16:32.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2013] [docker-java@googlegroups.com]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/github/dockerjava/client/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/client/command/StartContainerCmd.java
@@ -97,7 +97,7 @@ protected Void impl() throws DockerException {
 
 		try {
 			LOGGER.trace("POST: {}", webResource);
-			Builder builder = webResource.accept(MediaType.TEXT_PLAIN);
+			Builder builder = webResource.accept(MediaType.APPLICATION_JSON);
 			if (startContainerConfig != null) {
 				builder.type(MediaType.APPLICATION_JSON).post(startContainerConfig);
 			} else {
diff --git a/src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java b/src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java
@@ -83,6 +83,7 @@ public void startContainerWithVolumes() throws DockerException {
 		containerInspectResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
 		
+
 		assertThat(Arrays.asList(containerInspectResponse.getVolumes()),
 				contains(volume1, volume2));
 
@@ -117,7 +118,7 @@ public void startContainerWithPortBindings() throws DockerException {
 
 		containerInspectResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
-		
+
 		assertThat(Arrays.asList(containerInspectResponse.getConfig().getExposedPorts()),
 				contains(tcp22, tcp23));
 
@@ -190,7 +191,7 @@ public void startContainerWithLinking() throws DockerException {
 	public void startContainer() throws DockerException {
 
 		ContainerCreateResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+			.createContainerCmd("busybox").withCmd(new String[] { "top" }).exec();
 		
 		LOG.info("Created container {}", container.toString());
 		assertThat(container.getId(), not(isEmptyString()));
