Skip to content

Fix CreateContainerCmd.withDns() #107

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 1 commit into from
Dec 4, 2014
Merged

Fix CreateContainerCmd.withDns() #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
@JsonProperty("StdinOnce") private boolean stdInOnce = false;
@JsonProperty("Env") private String[] env;
@JsonProperty("Cmd") private String[] cmd;
@JsonProperty("Dns") private String[] dns;
@JsonProperty("Image") private String image;
@JsonProperty("Volumes") private Volumes volumes = new Volumes();
@JsonProperty("VolumesFrom") private String[] volumesFrom = new String[]{};
Expand Down Expand Up @@ -257,13 +256,13 @@ public CreateContainerCmdImpl withCmd(String... cmd) {
}

@Override
public String[] getDns() {
return dns;
public String[] getDns() {
return hostConfig.getDns();
}

@Override
public CreateContainerCmdImpl withDns(String... dns) {
this.dns = dns;
public CreateContainerCmdImpl withDns(String... dns) {
hostConfig.setDns(dns);
return this;
}

Expand Down
21 changes: 21 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,25 @@ public void createContainerWithCapAddAndCapDrop() throws DockerException {
.getCapDrop()), contains(MKNOD));
}

@Test
public void createContainerWithDns() throws DockerException {

String aDnsServer = "8.8.8.8";
String anotherDnsServer = "8.8.4.4";

CreateContainerResponse container = dockerClient
.createContainerCmd("busybox")
.withCmd("true").withDns(aDnsServer, anotherDnsServer).exec();

LOG.info("Created container {}", container.toString());

assertThat(container.getId(), not(isEmptyString()));

InspectContainerResponse inspectContainerResponse = dockerClient
.inspectContainerCmd(container.getId()).exec();

assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
contains(aDnsServer, anotherDnsServer));
}

}
7 changes: 2 additions & 5 deletions src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,15 @@ public void startContainerWithDns() throws DockerException {

CreateContainerResponse container = dockerClient
.createContainerCmd("busybox")
.withCmd("true").withDns(aDnsServer, anotherDnsServer).exec();
.withCmd("true").exec();

LOG.info("Created container {}", container.toString());

assertThat(container.getId(), not(isEmptyString()));

InspectContainerResponse inspectContainerResponse = dockerClient
.inspectContainerCmd(container.getId()).exec();

dockerClient.startContainerCmd(container.getId()).withDns(aDnsServer, anotherDnsServer).exec();

inspectContainerResponse = dockerClient.inspectContainerCmd(container
InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container
.getId()).exec();

assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
Expand Down