| commit | b77b51c0f1253f9dd75e4ef9f8f7bd5f1d96b83f | [log] [tgz] |
|---|---|---|
| author | David Bosschaert <davidb@apache.org> | Mon May 29 16:41:08 2017 +0100 |
| committer | David Bosschaert <davidb@apache.org> | Mon May 29 16:41:08 2017 +0100 |
| tree | 33b6d1cbfed694254f452729d7cafbe227700a49 | |
| parent | b306a5e9aa1c12f8c7e81b5fac06a0da19f51458 [diff] |
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.
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 @@ 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");
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 @@ 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());