Entrypoint should be a JSON array
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/21e220be Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/21e220be Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/21e220be Branch: refs/heads/master Commit: 21e220be1fb93581944518156b08b433c90f274b Parents: e5a1507 Author: Andrew Kennedy <[email protected]> Authored: Fri Oct 10 18:50:28 2014 +0100 Committer: Andrew Kennedy <[email protected]> Committed: Fri Oct 10 18:51:58 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/jclouds/docker/domain/Config.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/21e220be/docker/src/main/java/org/jclouds/docker/domain/Config.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/domain/Config.java b/docker/src/main/java/org/jclouds/docker/domain/Config.java index 3674d6d..5dd2b77 100644 --- a/docker/src/main/java/org/jclouds/docker/domain/Config.java +++ b/docker/src/main/java/org/jclouds/docker/domain/Config.java @@ -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; }
