From 003a68f45eb75233fa646c17c38b7ef6f3934425 Mon Sep 17 00:00:00 2001 From: Johannes Duesing Date: Sun, 20 Jan 2019 17:36:30 +0100 Subject: [PATCH] Renamed docker host environment variable to DELPHI_DOCKER_HOST --- README.md | 2 +- .../swt/delphi/instanceregistry/Docker/DockerConnection.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1249582..f5dfd1d 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Before you can start the application, you have to make sure your configuration f |```maxIndividualIpReq``` | ```Int``` | ```200``` | Maximum number of requests that are allowed to be executed during the current refresh period for one specific origin ip.| |```ipLogRefreshRate``` | ```FiniteDuration``` | ```2.minutes``` | Duration of the log refresh period.| -By default, Docker is expected to be reachable at *http://localhost:9095*, but you can override this setting by specifying the docker host URI in the environment variable *DOCKER_HOST*. +By default, Docker is expected to be reachable at *http://localhost:9095*, but you can override this setting by specifying the docker host URI in the environment variable *DELPHI_DOCKER_HOST*. To change the port of your http docker API to 9095, execute ``` edit /lib/systemd/system/docker.service diff --git a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerConnection.scala b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerConnection.scala index a83b659..9ac1153 100644 --- a/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerConnection.scala +++ b/src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerConnection.scala @@ -14,7 +14,7 @@ object DockerConnection { def fromEnvironment()(implicit system: ActorSystem, materializer: Materializer): DockerConnection = { def env(key: String): Option[String] = sys.env.get(key).filter(_.nonEmpty) - val host = env("DOCKER_HOST").getOrElse { + val host = env("DELPHI_DOCKER_HOST").getOrElse { "http://localhost:9095" } DockerHttpConnection(host)