Docker upgrades (#48)

* rebased

* made Lighthouse more flexible in terms of its external Docker support.

Author: Aaronontheweb

.gitattributes

@@ -0,0 +1 @@
+* -crlf

build-docker.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z ${1} ]; then
+  # no version number passed in, get last release tag from github
+  release_tag=`git describe --tags $(git rev-list --tags --max-count=1)`
+else
+  # can pass a target release tag e.g. bash docker-build.sh v1.0.2
+  # must include the "v" at the front of the version number e.g. "v1.0.2" NOT "1.0.2"
+  release_tag=$1
+fi
+
+docker build -t petabridge/lighthouse:netcore1.1 -t petabridge/lighthouse:${release_tag} -t petabridge/lighthouse:latest .

src/Lighthouse/LighthouseHostFactory.cs

@@ -14,6 +14,17 @@ public static class LighthouseHostFactory
     {
         public static ActorSystem LaunchLighthouse(string ipAddress = null, int? specifiedPort = null, string systemName = null)
         {
+            systemName = systemName ?? Environment.GetEnvironmentVariable("ACTORSYSTEM")?.Trim();
+            ipAddress = ipAddress ?? Environment.GetEnvironmentVariable("CLUSTER_IP")?.Trim();
+            if (specifiedPort == null)
+            {
+                var envPort = Environment.GetEnvironmentVariable("CLUSTER_PORT")?.Trim();
+                if (!string.IsNullOrEmpty(envPort) && int.TryParse(envPort, out var actualPort))
+                {
+                    specifiedPort = actualPort;
+                }
+            }
+
             var clusterConfig = ConfigurationFactory.ParseString(File.ReadAllText("akka.hocon"));
 
             var lighthouseConfig = clusterConfig.GetConfig("lighthouse");
@@ -23,9 +34,13 @@ public static ActorSystem LaunchLighthouse(string ipAddress = null, int? specifi
             }
 
             var remoteConfig = clusterConfig.GetConfig("akka.remote");
-            ipAddress = ipAddress ??
-                        remoteConfig.GetString("dot-netty.tcp.public-hostname") ??
-                        "127.0.0.1"; //localhost as a final default
+
+            if (string.IsNullOrEmpty(ipAddress))
+            {
+                ipAddress = remoteConfig.GetString("dot-netty.tcp.public-hostname") ??
+                            "127.0.0.1"; //localhost as a final default
+            }
+           
             int port = specifiedPort ?? remoteConfig.GetInt("dot-netty.tcp.port");
 
             if (port == 0) throw new ConfigurationException("Need to specify an explicit port for Lighthouse. Found an undefined port or a port value of 0 in App.config.");
@@ -40,7 +55,19 @@ public static ActorSystem LaunchLighthouse(string ipAddress = null, int? specifi
             selfAddress = new Address("akka.tcp", systemName, ipAddress.Trim(), port).ToString();
             Console.WriteLine("[Lighthouse] Parse successful.");
 
+            var clusterSeeds = Environment.GetEnvironmentVariable("CLUSTER_SEEDS")?.Trim();
+
             var seeds = clusterConfig.GetStringList("akka.cluster.seed-nodes");
+            if (!string.IsNullOrEmpty(clusterSeeds))
+            {
+                var tempSeeds = clusterSeeds.Trim('[', ']').Split(',');
+                if (tempSeeds.Any())
+                {
+                    seeds = tempSeeds;
+                }
+            }
+
+           
             if (!seeds.Contains(selfAddress))
             {
                 seeds.Add(selfAddress);

src/Lighthouse/LighthouseService.cs

@@ -28,12 +28,7 @@ public class LighthouseService
 
         private ActorSystem _lighthouseSystem;
 
-        /*
-        * var ipAddress = ;
-            var actorSystemName = Environment.GetEnvironmentVariable("actorSystemName"); 
-        */
-
-        public LighthouseService() : this(Environment.GetEnvironmentVariable("CONTAINER_IP"), null, Environment.GetEnvironmentVariable("ACTORSYSTEM")) { }
+        public LighthouseService() : this(null, null, null) { }
 
         public LighthouseService(string ipAddress, int? port, string actorSystemName)
         {

src/Lighthouse/get-dockerip.sh

@@ -1,6 +1,11 @@
 #!/bin/sh
-host=$(hostname -i)
-echo "Docker container bound on $host"
-export CONTAINER_IP="$host"
+
+if [ -z "$CLUSTER_IP"]; then
+	host=$(hostname -i)
+	echo "Docker container bound on $host"
+	export CLUSTER_IP="$host"
+else
+	echo "Docker container bound on $CLUSTER_IP"
+fi
 
 exec "$@"