lib/minke/docker/service_discovery.rb in minke-1.6.1 vs lib/minke/docker/service_discovery.rb in minke-1.8.0

@@ -1,33 +1,57 @@
 module Minke
   module Docker
     ##
     # ServiceDiscovery allows you to look up the publicly accessible address and port for a server
     class ServiceDiscovery
-      def initialize config
-        reader = Minke::Config::Reader.new
-        @config = reader.read config
+      def initialize project_name, docker_runner
+        @project_name = project_name
+        @docker_runner = docker_runner
       end
 
       ##
       # Will attempt to locate the public details for a running container given
       # its name and private port
       # Parameters:
-      # - container_name: the name of the running container
+      # - service_name: the name of the running service
       # - private_port: the private port which you wish to retrieve an address for
-      # - task: :run, :cucumber search either the run or cucumber section of the config
-      def public_address_for container_name, private_port, task
-        compose = Minke::Docker::DockerCompose.new @config.compose_file_for(task), Minke::Docker::SystemRunner.new
-        docker_runner = Minke::Docker::DockerRunner.new
+      # Returns:
+      # public address for the container e.g. 0.0.0.0:8080
+      def public_address_for service_name, private_port
+        begin
+          ip = @docker_runner.get_docker_ip_address
+          container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+          ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port }.first
+        rescue
+          raise "Unable to find public address for '#{service_name}' on port #{private_port}"
+        end
 
-        public_address = compose.public_address container_name, private_port
+        return "#{ip}:#{ports['PublicPort']}"
+      end
 
-        ip = docker_runner.get_docker_ip_address
-        if  ip != "127.0.0.1" && ip != "0.0.0.0" && ip != nil
-          public_address.gsub!('0.0.0.0', ip)
+      ##
+      # Will attempt to locate the private details for a running container given
+      # its name and private port
+      # Parameters:
+      # - service_name: the name of the running service
+      # - private_port: the private port which you wish to retrieve an address for
+      # Returns:
+      # private address for the container e.g. 172.17.0.2:8080
+      def bridge_address_for service_name, private_port
+        begin
+          puts "/#{@project_name}_#{service_name}_1"
+          container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
+          ip = container_details.first.info['NetworkSettings']['Networks']['bridge']['IPAddress']
+        rescue
+          raise "Unable to find bridge address for '#{service_name}' on port #{private_port}"
         end
+        return "#{ip}:#{private_port}"
+      end
 
-        public_address
+      :private
+      def find_container_by_name name
+        containers = @docker_runner.running_containers
+        containers.select { |c| c.info['Names'].include?(name) }
       end
     end
   end
 end