Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entrypoint should be a JSON array

This commit is contained in:
Andrew Kennedy 2014-10-10 18:50:28 +01:00
parent 96446269d2
commit 1c5a805a4d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apis/docker/src/main/java/org/jclouds/docker/domain/Config.java
View File

@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@ -72,7 +71,7 @@ public class Config {
@SerializedName("WorkingDir")
private final String workingDir;
@SerializedName("Entrypoint")
private final String entrypoint;
private final List<String> entrypoint;
@SerializedName("NetworkDisabled")
private final boolean networkDisabled;
@SerializedName("OnBuild")
@ -87,7 +86,7 @@ public class Config {
boolean attachStderr, Map<String, ?> exposedPorts, boolean tty, boolean openStdin,
boolean stdinOnce, @Nullable List<String> env, @Nullable List<String> cmd,
@Nullable List<String> dns, String imageId, @Nullable Map<String, ?> volumes,
@Nullable String volumesFrom, @Nullable String workingDir, @Nullable String entrypoint,
@Nullable String volumesFrom, @Nullable String workingDir, @Nullable List<String> entrypoint,
@Nullable boolean networkDisabled, @Nullable List<String> onBuild) {
this.hostname = hostname;
this.domainName = domainName;
@ -194,7 +193,7 @@ public class Config {
return workingDir;
}
public String getEntrypoint() {
public List<String> getEntrypoint() {
return entrypoint;
}
@ -246,7 +245,7 @@ public class Config {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("hostname", hostname)
.add("domainName", domainName)
.add("user", user)
@ -302,7 +301,7 @@ public class Config {
private Map<String, ?> volumes = ImmutableMap.of();
private String volumesFrom;
private String workingDir;
private String entrypoint;
private List<String> entrypoint = ImmutableList.of();
private boolean networkDisabled;
private List<String> onBuild = ImmutableList.of();
@ -406,7 +405,7 @@ public class Config {
return this;
}
public Builder entrypoint(String entrypoint) {
public Builder entrypoint(List<String> entrypoint) {
this.entrypoint = entrypoint;
return this;
}