X Tutup
Skip to content

Fixes for startContainerCmd #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 5 commits into from
Jul 15, 2014
Merged

Fixes for startContainerCmd #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a6441c
Fixed issue with StartContainerCmd
patelrit Jul 14, 2014
c9eec27
Fixed startContainer use cases
patelrit Jul 15, 2014
c95c967
Fixed issue with StartContainerCmd
patelrit Jul 14, 2014
622071e
Merge branch 'master' of https://github.com/NirmataOSS/docker-java
patelrit Jul 15, 2014
7acbfaa
Fix merge issue
patelrit Jul 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/client/command/StartContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public void startContainerWithVolumes() throws DockerException {
containerInspectResponse = dockerClient.inspectContainerCmd(container
.getId()).exec();


assertThat(Arrays.asList(containerInspectResponse.getVolumes()),
contains(volume1, volume2));

Expand Down Expand Up @@ -117,7 +118,7 @@ public void startContainerWithPortBindings() throws DockerException {

containerInspectResponse = dockerClient.inspectContainerCmd(container
.getId()).exec();

assertThat(Arrays.asList(containerInspectResponse.getConfig().getExposedPorts()),
contains(tcp22, tcp23));

Expand Down Expand Up @@ -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()));
Expand Down
X Tutup