X Tutup
Skip to content

Fix Issue #44 Adjusting DNS property type to be a String array as specified by the Doc... #45

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
Aug 23, 2014
Merged

Fix Issue #44 Adjusting DNS property type to be a String array as specified by the Doc... #45

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
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public class HostConfig {
private boolean privileged;

@JsonProperty("Dns")
private String dns;
private String[] dns;

@JsonProperty("VolumesFrom")
private String[] volumesFrom;
Expand Down Expand Up @@ -295,7 +295,7 @@ public boolean isPrivileged() {
return privileged;
}

public String getDns() {
public String[] getDns() {
return dns;
}

Expand Down
7 changes: 2 additions & 5 deletions src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package com.github.dockerjava.api.command;

import java.util.List;

import com.github.dockerjava.api.NotFoundException;
import com.github.dockerjava.api.NotModifiedException;
import com.github.dockerjava.api.model.Bind;
import com.github.dockerjava.api.model.Link;
import com.github.dockerjava.api.model.LxcConf;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.SearchItem;

/**
* Start a container
Expand All @@ -27,7 +24,7 @@ public interface StartContainerCmd extends DockerCmd<Void> {

public boolean isPrivileged();

public String getDns();
public String[] getDns();

public String getVolumesFrom();

Expand All @@ -45,7 +42,7 @@ public interface StartContainerCmd extends DockerCmd<Void> {

public StartContainerCmd withPublishAllPorts(boolean publishAllPorts);

public StartContainerCmd withDns(String dns);
public StartContainerCmd withDns(String... dns);

public StartContainerCmd withVolumesFrom(String volumesFrom);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Voi
private boolean privileged;

@JsonProperty("Dns")
private String dns;
private String[] dns;

@JsonProperty("VolumesFrom")
private String volumesFrom;
Expand Down Expand Up @@ -90,7 +90,7 @@ public boolean isPrivileged() {
}

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

Expand Down Expand Up @@ -153,7 +153,7 @@ public StartContainerCmd withPublishAllPorts(boolean publishAllPorts) {
}

@Override
public StartContainerCmd withDns(String dns) {
public StartContainerCmd withDns(String... dns) {
Preconditions.checkNotNull(dns, "dns was not specified");
this.dns = dns;
return this;
Expand Down
28 changes: 28 additions & 0 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 @@ -92,6 +92,34 @@ public void startContainerWithVolumes() throws DockerException {
tmpContainers.add(container.getId());
}

@Test
public void startContainerWithDns() 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();

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

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

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

tmpContainers.add(container.getId());
}

@Test
public void startContainerWithPortBindings() throws DockerException {

Expand Down
X Tutup