vagrant-dnsdock-hostupdater 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390d2a2a840f4a07852d57172230f67600396433
-  data.tar.gz: 250965b27a89eb7ea9ab85667e28ab1bce9144c8
+  metadata.gz: e3573580bb55bd09385772c7bcdd7cff5564d6e4
+  data.tar.gz: 7aa965373fe6f88c2c4347895a1d69bcb6a98f7c
 SHA512:
-  metadata.gz: 7169e32d4954b21e334a22b860e759cc4d656686696ba92087fca5de738171c4ae695ae9c76d27275ac8907c48489a05661049f6d108dbde96e9e8ba0a12d707
-  data.tar.gz: 5e3f7648fbee8556e52644b0bc8d23c99b22aa6269433ac95ebce8810791c0957c9b2f6fb140b1fd7398b2f7c019b4cac4d931d91db031bd5d4964871a1fe56c
+  metadata.gz: 882ec6bc80ec52c62c1b2106209df03f8b6c00a0951dca92ca1901c750e6d87ba4e691c0313cc6643d48d084c67a15fc6a29d5c7568473a349d3a8483b9bf617
+  data.tar.gz: a6dbbf6cab2d0dafda674da90e5cb9700bb17276a86166727ad67e198b14e90c934c0d35fd821c32951eb8f1eb79b220bc444689b62ca3e111b20726832aaf80

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+
+gemspec
+
+# group :development do
+#   gem 'vagrant',
+#       git: 'https://github.com/mitchellh/vagrant.git',
+#       ref: ENV.fetch('VAGRANT_VERSION', 'v1.9.1')
+# end
+#
+# group :plugins do
+#   gem "vagrant-dnsdock-hostupdater", path: "."
+# end
+#

data/lib/client.rb

@@ -1,5 +1,4 @@
 require_relative 'host-manager'
 
 HostManager::Client
-    .create('10.10.10.1', 2991)
-    .send_action('delete', 'the1234.test.host', '127.0.0.1', 'containerid')
+    .create('192.168.200.1', 2991)

data/lib/event-watcher.rb

@@ -1,58 +1,51 @@
 require_relative 'host-manager'
 require 'yaml'
-
-def update
-  client = HostManager::Client.create('10.10.10.1', 2991)
-  client.host_suffix '.local.signal.sh'
-  client.sync_hosts Docker::Container.all({:all => true})
-  client.close
-end
-
-sleep(2)
-
-update
-
-loop {
-  begin
-    Docker::Event.stream { |event|
-      HostManager.log.info 'Connected to docker socket. Listening for events.'
-      # respond to all container events
-
+require 'pp'
+
+module HostManager
+  class DockerEvent
+
+    def self.update(ip, port, host_suffix)
+      client = HostManager::Client.create(ip, port)
+      client.host_suffix host_suffix
+      client.sync_hosts Docker::Container.all({:all => true})
+      client.close
+    end
+
+    def self.run(ip, port, host_suffix)
+      # sync existing host entries on start (normally this will remove old left-over entries)
+      self.update(ip, port, host_suffix)
+
+      sleep(2)
+      loop {
+        run_once(ip, port, host_suffix)
+      }
+    end
+
+    private
+    def self.run_once(ip, port, host_suffix)
       begin
-        if event.type == 'container'
-          # container_id = event.actor.id.chomp
-
-          # puts event.action
+        Docker::Event.stream { |event|
+          HostManager.log.info 'Connected to docker socket. Listening for events.'
+          # respond to all container events
 
-          # container = Docker::Container.get(container_id)
-          # ip = container.info['NetworkSettings']['IPAddress']
-          # HostManager.log.info container.
-          # puts event.type
+          begin
+            if event.type == 'container' && %w(start die).include?(event.action)
+              self.update(ip, port, host_suffix)
+            end
 
-          # container_name = container.info['Name'].sub!(/^\//, '')
-
-
-          # To handle updating single entries
-          # if event.action == 'start'
-          #   client.send_action('create', container_name, ip, container_id)
-          # elsif event.action == 'die'
-          #   client.send_action('delete', container_name, ip, container_id)
-          # end
-
-          if event.action == 'start' || event.action == 'die'
-            update
+          rescue => e
+            puts e.inspect
           end
 
-        end
-      rescue => e
-        puts e.inspect
-      end
+          break
+        }
 
-      break
-    }
-
-  rescue Docker::Error::TimeoutError
-    HostManager.log.info 'Docker socket connection timed out whilst listening for events. Reconnecting...'
+      rescue Docker::Error::TimeoutError
+        HostManager.log.info 'Docker socket connection timed out whilst listening for events. Reconnecting...'
+      end
+    end
   end
-}
+end
 
+HostManager::DockerEvent.run('192.168.200.1', 2991, '.local.signal.sh')

data/lib/host-manager.rb

@@ -53,10 +53,35 @@ module HostManager
       if container_name.include?('.')
         container_name
       else
-        container_name.sub(/^\//, '').gsub(/_/, '-') + host_suffix
+        sanitize_host_value(container_name) + host_suffix
       end
     end
 
+    def compose_host_names(container)
+      names = []
+      labels = container.info['Config']['Labels']
+
+      name = labels['com.docker.compose.project']
+      service = labels['com.docker.compose.service']
+
+
+      if name != nil && service != nil
+        service = sanitize_host_value(service)
+        name = sanitize_host_value(name)
+
+        container_num = labels['com.docker.compose.container-number']
+        if container_num == '1'
+          names.push("#{service}.#{name}#{host_suffix}")
+        else
+          names.push("#{service}-#{container_num}.#{name}#{host_suffix}")
+        end
+      else
+        names.push(host_name(container.info['Name']))
+      end
+
+      names
+    end
+
     def host_suffix(suffix = nil)
       if suffix != nil
         @domain_suffix = suffix
@@ -98,13 +123,15 @@ module HostManager
               ip = container.info['NetworkSettings']['IPAddress']
 
               if ip
-                item = {
-                    :hostname => host_name(name),
-                    :ip => ip,
-                    :containerId => container.info['id']
-                }
-
-                data.push(item)
+                compose_host_names(container).each do |hostname|
+                  item = {
+                      :hostname => hostname,
+                      :ip => ip,
+                      :containerId => container.info['id']
+                  }
+
+                  data.push(item)
+                end
               else
                 log.warn("Ignored request to create hosts entry due to no IP being returned from container: #{name}")
               end
@@ -150,9 +177,10 @@ module HostManager
     end
 
     def add_entry(entry, hosts)
-      if entry['ip'] && entry['containerId'] && entry['hostname']
-        comment = HostManager.comment_prefix + (entry['containerId'] ? " Container ID: #{entry['containerId']}" : '')
-        hosts.elements << Hosts::Entry.new(entry['ip'], entry['hostname'], :comment => comment)
+      if entry[:ip] && entry[:containerId] && entry[:hostname]
+        comment = HostManager.comment_prefix + (entry['containerId'] ? " Container ID: #{entry[:containerId]}" : '')
+        log.info "Adding entry: #{entry[:hostname]} => #{entry[:ip]}"
+        hosts.elements << Hosts::Entry.new(entry[:ip], entry[:hostname], :comment => comment)
 
       else
         log.warn 'Unable to write entry due to missing values [ip,containerId,hostname]: ' + entry.to_json
@@ -162,9 +190,6 @@ module HostManager
     def execute(action, hostname, ip, container_id = nil)
       hosts = get_hosts
 
-
-      # todo: remove all entries and then re-add (sync hosts every time)
-
       if action == 'create'
         hosts.elements.each do |element|
           if valid_entry?(element) && hostname == element.name
@@ -193,6 +218,12 @@ module HostManager
       end
     end
 
+    private
+
+    def sanitize_host_value(value)
+      value.sub(/^\//, '').gsub(/_/, '-')
+    end
+
   end
 
   class Server < Base
@@ -239,20 +270,6 @@ module HostManager
       @socket.close
     end
 
-    def send_action(action, hostname, ip, container_id = nil)
-      data = {
-          :action => action,
-          :hostname => host_name(hostname),
-          :ip => ip,
-      }
-
-      if container_id
-        data[:containerId] = container_id
-      end
-
-      send(data)
-    end
-
     def sync_hosts(container_data)
       data = build_hosts_data(container_data)
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module DnsdockHostUpdater
-    VERSION = '0.0.20'.freeze
+    VERSION = '0.0.21'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsdock-hostupdater
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Brian Coit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -61,6 +61,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - Rakefile
 - lib/client.rb
 - lib/event-watcher.rb
@@ -83,7 +84,7 @@ files:
 - lib/vagrant-dnsdock-hostupdater/command.rb
 - lib/vagrant-dnsdock-hostupdater/plugin.rb
 - lib/version.rb
-homepage: https://bitbucket.org/blonde/shore
+homepage: https://bitbucket.org/briancoit
 licenses:
 - ISC
 metadata: {}
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Update hosts