Repository: jclouds-labs Updated Branches: refs/heads/1.8.x 4c7c29897 -> 6cfb43514
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/4662f903 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/4662f903 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/4662f903 Branch: refs/heads/1.8.x Commit: 4662f9033ab4d3a09059fd676d9e0e741bbd943a Parents: 4c7c298 Author: Andrew Kennedy <[email protected]> Authored: Fri Oct 10 18:50:28 2014 +0100 Committer: Adrian Cole <[email protected]> Committed: Tue Oct 28 08:18:55 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/docker/domain/Config.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4662f903/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 9c80472..5dd2b77 100644 --- a/docker/src/main/java/org/jclouds/docker/domain/Config.java +++ b/docker/src/main/java/org/jclouds/docker/domain/Config.java @@ -71,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") @@ -86,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; @@ -193,7 +193,7 @@ public class Config { return workingDir; } - public String getEntrypoint() { + public List<String> getEntrypoint() { return entrypoint; } @@ -301,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(); @@ -405,7 +405,7 @@ public class Config { return this; } - public Builder entrypoint(String entrypoint) { + public Builder entrypoint(List<String> entrypoint) { this.entrypoint = entrypoint; return this; }
