You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/17 13:39:48 UTC
[1/8] git commit: Set hostname in template options
Repository: jclouds-labs
Updated Branches:
refs/heads/master 7ec7f0771 -> 1c4c925ba
Set hostname in template options
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/fd7d7cda
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/fd7d7cda
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/fd7d7cda
Branch: refs/heads/master
Commit: fd7d7cda7bd93301967aa342b7048ca8913ad136
Parents: c799e8f
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Fri Oct 10 18:51:46 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Fri Oct 10 18:51:58 2014 +0100
----------------------------------------------------------------------
.../docker/compute/strategy/DockerComputeServiceAdapter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/fd7d7cda/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java b/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
index 7bbead3..a4bcd3a 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
@@ -100,6 +100,10 @@ public class DockerComputeServiceAdapter implements
containerConfigBuilder.memory(templateOptions.getMemory().get());
}
+ if (templateOptions.getHostname().isPresent()) {
+ containerConfigBuilder.hostname(templateOptions.getHostname().get());
+ }
+
if (templateOptions.getCpuShares().isPresent()) {
containerConfigBuilder.cpuShares(templateOptions.getCpuShares().get());
}
[6/8] git commit: Add environment config option for Docker containers
Posted by an...@apache.org.
Add environment config option for Docker containers
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/a543b8d5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/a543b8d5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/a543b8d5
Branch: refs/heads/master
Commit: a543b8d58e57b060116186006ba5c939e9bc93a0
Parents: 911d5c5
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Sat Oct 11 17:01:32 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Sat Oct 11 18:18:11 2014 +0100
----------------------------------------------------------------------
.../compute/options/DockerTemplateOptions.java | 48 ++++++++++++++------
.../strategy/DockerComputeServiceAdapter.java | 4 ++
.../java/org/jclouds/docker/domain/Config.java | 15 +++---
3 files changed, 47 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a543b8d5/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
index 36029da..9568f33 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.compute.options;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -54,6 +53,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
protected Optional<Integer> cpuShares = Optional.absent();
protected Optional<List<String>> commands = Optional.absent();
protected Optional<Map<String, String>> volumes = Optional.absent();
+ protected Optional<List<String>> env = Optional.absent();
@Override
public DockerTemplateOptions clone() {
@@ -83,8 +83,11 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
eTo.commands(commands.get());
}
if (cpuShares.isPresent()) {
- eTo.cpuShares(cpuShares.get());
- }
+ eTo.cpuShares(cpuShares.get());
+ }
+ if (env.isPresent()) {
+ eTo.env(env.get());
+ }
}
}
@@ -100,23 +103,25 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
equal(this.dns, that.dns) &&
equal(this.memory, that.memory) &&
equal(this.commands, that.commands) &&
- equal(this.cpuShares, that.cpuShares);
+ equal(this.cpuShares, that.cpuShares) &&
+ equal(this.env, that.env);
}
@Override
public int hashCode() {
- return Objects.hashCode(super.hashCode(), volumes, hostname, dns, memory, commands, cpuShares);
+ return Objects.hashCode(super.hashCode(), volumes, hostname, dns, memory, commands, cpuShares, env);
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("dns", dns)
.add("hostname", hostname)
.add("memory", memory)
.add("cpuShares", cpuShares)
.add("commands", commands)
.add("volumes", volumes)
+ .add("env", env)
.toString();
}
@@ -158,6 +163,11 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
return this;
}
+ public DockerTemplateOptions env(List<String> env) {
+ this.env = Optional.<List<String>> of(ImmutableList.copyOf(env));
+ return this;
+ }
+
public Optional<Map<String, String>> getVolumes() {
return volumes;
}
@@ -174,15 +184,19 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
public Optional<Integer> getCpuShares() { return cpuShares; }
+ public Optional<List<String>> getEnv() {
+ return env;
+ }
+
public static class Builder {
- /**
- * @see DockerTemplateOptions#volumes(java.util.Map)
- */
- public static DockerTemplateOptions volumes(Map<String, String> volumes) {
- DockerTemplateOptions options = new DockerTemplateOptions();
- return DockerTemplateOptions.class.cast(options.volumes(volumes));
- }
+ /**
+ * @see DockerTemplateOptions#volumes(java.util.Map)
+ */
+ public static DockerTemplateOptions volumes(Map<String, String> volumes) {
+ DockerTemplateOptions options = new DockerTemplateOptions();
+ return DockerTemplateOptions.class.cast(options.volumes(volumes));
+ }
/**
* @see DockerTemplateOptions#dns(String)
@@ -229,6 +243,14 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
return DockerTemplateOptions.class.cast(options.cpuShares(cpuShares));
}
+ /**
+ * @see DockerTemplateOptions#env(java.util.List)
+ */
+ public static DockerTemplateOptions env(List<String> env) {
+ DockerTemplateOptions options = new DockerTemplateOptions();
+ return DockerTemplateOptions.class.cast(options.env(env));
+ }
+
// methods that only facilitate returning the correct object type
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a543b8d5/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java b/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
index a4bcd3a..d1c1260 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java
@@ -108,6 +108,10 @@ public class DockerComputeServiceAdapter implements
containerConfigBuilder.cpuShares(templateOptions.getCpuShares().get());
}
+ if (templateOptions.getEnv().isPresent()) {
+ containerConfigBuilder.env(templateOptions.getEnv().get());
+ }
+
if (templateOptions.getVolumes().isPresent()) {
Map<String, Object> volumes = Maps.newLinkedHashMap();
for (String containerDir : templateOptions.getVolumes().get().values()) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a543b8d5/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 5dd2b77..f5190fa 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Config.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Config.java
@@ -16,17 +16,18 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.gson.annotations.SerializedName;
-import org.jclouds.javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.List;
import java.util.Map;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.jclouds.javax.annotation.Nullable;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.annotations.SerializedName;
public class Config {
@@ -291,10 +292,10 @@ public class Config {
private boolean attachStdout;
private boolean attachStderr;
private Map<String, ?> exposedPorts = ImmutableMap.of();
+ private List<String> env = ImmutableList.of();
private boolean tty;
private boolean openStdin;
private boolean stdinOnce;
- private List<String> env = ImmutableList.of();
private List<String> cmd = ImmutableList.of();
private List<String> dns = ImmutableList.of();
private String imageId;
[2/8] git commit: Fix Container conversion when image ID not present
Posted by an...@apache.org.
Fix Container conversion when image ID not present
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/c799e8fd
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/c799e8fd
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/c799e8fd
Branch: refs/heads/master
Commit: c799e8fd7c6df988983e77ef4efc314d3e4b4ef3
Parents: 21e220b
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Fri Oct 10 18:51:18 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Fri Oct 10 18:51:58 2014 +0100
----------------------------------------------------------------------
.../docker/compute/functions/ContainerToNodeMetadata.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/c799e8fd/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java b/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
index 72c16af..6d54507 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
@@ -18,6 +18,7 @@ package org.jclouds.docker.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.getOnlyElement;
+
import java.net.URI;
import java.util.List;
import java.util.Map;
@@ -86,9 +87,12 @@ public class ContainerToNodeMetadata implements Function<Container, NodeMetadata
builder.publicAddresses(getPublicIpAddresses());
builder.privateAddresses(getPrivateIpAddresses(container));
builder.location(Iterables.getOnlyElement(locations.get()));
- Image image = images.get().get(container.getImage());
- builder.imageId(image.getId());
- builder.operatingSystem(image.getOperatingSystem());
+ String imageId = container.getImage();
+ builder.imageId(imageId);
+ if (images.get().containsKey(imageId)) {
+ Image image = images.get().get(imageId);
+ builder.operatingSystem(image.getOperatingSystem());
+ }
return builder.build();
}
[7/8] git commit: Added non-null Entrypoint data to test JSON file
for parsing
Posted by an...@apache.org.
Added non-null Entrypoint data to test JSON file for parsing
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/4360ba4b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/4360ba4b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/4360ba4b
Branch: refs/heads/master
Commit: 4360ba4b7d8e06d01d7a3222ddc2a9746ffe750f
Parents: a543b8d
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Sun Oct 12 01:52:05 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Sun Oct 12 01:52:05 2014 +0100
----------------------------------------------------------------------
docker/src/test/resources/container.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4360ba4b/docker/src/test/resources/container.json
----------------------------------------------------------------------
diff --git a/docker/src/test/resources/container.json b/docker/src/test/resources/container.json
index b353012..839abb6 100644
--- a/docker/src/test/resources/container.json
+++ b/docker/src/test/resources/container.json
@@ -15,7 +15,7 @@
"CpuShares": 0,
"Cpuset": "",
"Domainname": "",
- "Entrypoint": null,
+ "Entrypoint": [ "/usr/bin/sshd", "-d" ],
"Env": [
"HOME=/",
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
[3/8] git commit: Entrypoint should be a JSON array
Posted by an...@apache.org.
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 <an...@cloudsoftcorp.com>
Authored: Fri Oct 10 18:50:28 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
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;
}
[5/8] git commit: Document magic number in NodeMetadata for Docker
Posted by an...@apache.org.
Document magic number in NodeMetadata for Docker
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/911d5c57
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/911d5c57
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/911d5c57
Branch: refs/heads/master
Commit: 911d5c5712567a6e07ed9d560ca83ca62807cccd
Parents: a4d61fb
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Fri Oct 10 21:19:57 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Fri Oct 10 21:19:57 2014 +0100
----------------------------------------------------------------------
.../docker/compute/functions/ContainerToNodeMetadata.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/911d5c57/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java b/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
index 580e5f1..3ec7f5c 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
@@ -48,6 +48,14 @@ import com.google.inject.Singleton;
@Singleton
public class ContainerToNodeMetadata implements Function<Container, NodeMetadata> {
+ /**
+ * This value is used when a container does not have an accessible
+ * login port (i.e. the SSH daemon is not running) due to being
+ * started outside jclouds. Client code should check for this value
+ * when accessing NodeMetadata from Docker.
+ */
+ public static final Integer NO_LOGIN_PORT = Integer.valueOf(-1);
+
private final ProviderMetadata providerMetadata;
private final Function<State, NodeMetadata.Status> toPortableStatus;
private final GroupNamingConvention nodeNamingConvention;
@@ -125,6 +133,6 @@ public class ContainerToNodeMetadata implements Function<Container, NodeMetadata
}
}
}
- return -1;
+ return NO_LOGIN_PORT;
}
}
[4/8] git commit: Handle missing login port
Posted by an...@apache.org.
Handle missing login port
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/a4d61fbd
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/a4d61fbd
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/a4d61fbd
Branch: refs/heads/master
Commit: a4d61fbd6230a42e31333d4dfad9b8d926037b5c
Parents: fd7d7cd
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Fri Oct 10 19:02:48 2014 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Fri Oct 10 19:06:21 2014 +0100
----------------------------------------------------------------------
.../docker/compute/functions/ContainerToNodeMetadata.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a4d61fbd/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java b/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
index 6d54507..580e5f1 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/functions/ContainerToNodeMetadata.java
@@ -114,7 +114,7 @@ public class ContainerToNodeMetadata implements Function<Container, NodeMetadata
protected static int getLoginPort(Container container) {
if (container.getNetworkSettings() != null) {
Map<String, List<Map<String, String>>> ports = container.getNetworkSettings().getPorts();
- if (ports != null) {
+ if (ports != null && ports.containsKey("22/tcp")) {
return Integer.parseInt(getOnlyElement(ports.get("22/tcp")).get("HostPort"));
}
// this is needed in case the container list is coming from listContainers
@@ -125,6 +125,6 @@ public class ContainerToNodeMetadata implements Function<Container, NodeMetadata
}
}
}
- throw new IllegalStateException("Cannot determine the login port for " + container.getId());
+ return -1;
}
}
[8/8] git commit: This closes #89
Posted by an...@apache.org.
This closes #89
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/1c4c925b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/1c4c925b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/1c4c925b
Branch: refs/heads/master
Commit: 1c4c925ba3b409c52a3682a514541be19427b62b
Parents: 7ec7f07 4360ba4
Author: Andrea Turli <an...@gmail.com>
Authored: Fri Oct 17 13:39:23 2014 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Fri Oct 17 13:39:23 2014 +0200
----------------------------------------------------------------------
.../functions/ContainerToNodeMetadata.java | 22 +++++++--
.../compute/options/DockerTemplateOptions.java | 48 ++++++++++++++------
.../strategy/DockerComputeServiceAdapter.java | 8 ++++
.../java/org/jclouds/docker/domain/Config.java | 28 ++++++------
docker/src/test/resources/container.json | 2 +-
5 files changed, 75 insertions(+), 33 deletions(-)
----------------------------------------------------------------------