Repository: aries-containers Updated Branches: refs/heads/master b306a5e9a -> b77b51c0f
Some small editorial tweaks. Also removed name setting of the docker container for now as it causes issues when multiple replicas for the same service are running with the docker.local binding. Project: http://git-wip-us.apache.org/repos/asf/aries-containers/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-containers/commit/b77b51c0 Tree: http://git-wip-us.apache.org/repos/asf/aries-containers/tree/b77b51c0 Diff: http://git-wip-us.apache.org/repos/asf/aries-containers/diff/b77b51c0 Branch: refs/heads/master Commit: b77b51c0f1253f9dd75e4ef9f8f7bd5f1d96b83f Parents: b306a5e Author: David Bosschaert <[email protected]> Authored: Mon May 29 16:41:08 2017 +0100 Committer: David Bosschaert <[email protected]> Committed: Mon May 29 16:41:08 2017 +0100 ---------------------------------------------------------------------- .../containers/docker/local/impl/LocalDockerServiceManager.java | 3 --- .../java/org/apache/aries/containers/examples/javaapp/Main.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-containers/blob/b77b51c0/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerServiceManager.java ---------------------------------------------------------------------- diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerServiceManager.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerServiceManager.java index 6c01f7b..be91761 100644 --- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerServiceManager.java +++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerServiceManager.java @@ -109,9 +109,6 @@ public class LocalDockerServiceManager implements ServiceManager { command.add("-l"); command.add(SERVICE_NAME + "=" + config.getServiceName()); - command.add("--name"); - command.add(config.getServiceName()); - String ep = config.getEntryPoint(); if (ep != null) { command.add("--entrypoint"); http://git-wip-us.apache.org/repos/asf/aries-containers/blob/b77b51c0/containers-examples/containers-example-javaapp/src/main/java/org/apache/aries/containers/examples/javaapp/Main.java ---------------------------------------------------------------------- diff --git a/containers-examples/containers-example-javaapp/src/main/java/org/apache/aries/containers/examples/javaapp/Main.java b/containers-examples/containers-example-javaapp/src/main/java/org/apache/aries/containers/examples/javaapp/Main.java index 0f06a30..31ef97c 100644 --- a/containers-examples/containers-example-javaapp/src/main/java/org/apache/aries/containers/examples/javaapp/Main.java +++ b/containers-examples/containers-example-javaapp/src/main/java/org/apache/aries/containers/examples/javaapp/Main.java @@ -35,7 +35,7 @@ public class Main { ServiceManager sm = new LocalDockerServiceManager(); // If you want to run with Marathon, use the following line - // ServiceManager cf = new MarathonServiceManager("http://192.168.99.100:8080/";); + // ServiceManager sm = new MarathonServiceManager("http://192.168.99.100:8080/";); System.out.println("Currently known services: " + sm.listServices());
