vagrant-dnsdock-hostupdater 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024acc29cae06921872cb4dcd8ffae03c9d3651e
-  data.tar.gz: 9e7f158d7030a282d9daab8a51358bc0120f07f5
+  metadata.gz: a0dced9da0ff736e5641dd7d6e5e0154f9db87a4
+  data.tar.gz: ab09fc9827e6618275ca8eb3d86fc8d0f6c0afa6
 SHA512:
-  metadata.gz: cf9a3f80dc458ef8323318bf49bc01eac8d4a0dd314f086c73afc2ad04fa5f1d01ef44bfcb72ed0e0c38d0a2b7aff86044423d104520f0254abcbcde0614c49b
-  data.tar.gz: 2f222d9b676aefc501715f5b8afcf2a027d7f5fc76c984d6bd04b9a99887e758465b55796cedc382cba27a3f4bde1a44409bb0cc69f0017e798d69d229060f57
+  metadata.gz: 8c9a89a41498583338779437ed08ca5b08a3fc313b20ae7f2f75194b8fdbd4a6b4c030de210b76eac59c93c1829b49f2b1dc2872fb31669ef46737bead77e954
+  data.tar.gz: b8fac1c93d16df2f9f056ae1c990fb364156e339599fc7c00b49fc3e45269fe62f6246cba578af698cdfd29e9d120dc343bcf209307fca7d476ebbd9f6e2b407

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vagrant-dnsdock-hostupdater (0.0.23)
+    vagrant-dnsdock-hostupdater (0.0.24)
       docker-api (~> 1.33)
       linebreak (~> 2.1.0)
       log4r (~> 1.1.10)

data/lib/client.rb

@@ -0,0 +1,4 @@
+require_relative 'host-manager'
+
+HostManager::Client
+    .create('192.168.200.1', 2991)

data/lib/event-watcher.rb

@@ -0,0 +1,51 @@
+require_relative 'host-manager'
+require 'yaml'
+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
+        Docker::Event.stream { |event|
+          HostManager.log.info 'Connected to docker socket. Listening for events.'
+          # respond to all container events
+
+          begin
+            if event.type == 'container' && %w(start die).include?(event.action)
+              self.update(ip, port, host_suffix)
+            end
+
+          rescue => e
+            puts e.inspect
+          end
+
+          break
+        }
+
+      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

@@ -0,0 +1,298 @@
+require 'socket' # Get sockets from stdlib
+require 'json'
+require_relative 'hosts/hosts'
+require 'docker'
+require 'logger'
+require 'log4r'
+
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.mac?
+    (/darwin/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.unix?
+    !OS.windows?
+  end
+
+  def OS.linux?
+    OS.unix? and not OS.mac?
+  end
+end
+
+module HostManager
+
+  def self.log
+    unless @log
+      @log = Log4r::Logger.new('main')
+      @log.outputters << Log4r::Outputter.stdout
+      @log.outputters << Log4r::FileOutputter.new('logmain', :filename => 'host-manager.log')
+    end
+
+    @log
+  end
+
+  def self.comment_prefix
+    'Managed by Vagrant plugin - do not remove.'
+  end
+
+  def self.host_file_path
+    OS.windows? ? `echo %SystemRoot%\\System32\\drivers\\etc\\hosts`.chomp : '/etc/hosts'
+  end
+
+  class Base
+
+    def log
+      HostManager.log
+    end
+
+    def host_name(container_name)
+      if container_name.include?('.')
+        container_name
+      else
+        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
+      else
+        @domain_suffix
+      end
+    end
+
+    # Determine if entry is managed by this utility or not
+    def valid_entry?(element)
+      # check it's a managed host first
+      if element.respond_to?(:comment) && element.comment.to_s.start_with?(HostManager.comment_prefix)
+        # check we have hostname and ip
+        if element.respond_to?(:name) && element.respond_to?(:address)
+          return true
+        end
+      end
+    end
+
+    def get_hosts
+      unless @host_manager
+        @host_manager = Hosts::File.read(HostManager.host_file_path)
+      end
+
+      @host_manager
+    end
+
+    def build_hosts_data(container_data)
+      data = []
+
+      if container_data && container_data.is_a?(Array)
+        container_data.each do |container_info|
+          container = Docker::Container.get(container_info.info['id'])
+
+          if container.info['State']['Running']
+            name = container.info['Name']
+
+            if name
+              ip = container.info['NetworkSettings']['IPAddress']
+
+              if ip
+                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
+            end
+          end
+
+        end
+      end
+
+      data
+    end
+
+    def update_hosts_file(data)
+      if data.is_a?(Hash)
+        required_keys = %w(action hostname ip containerId)
+        required_keys.each do |key|
+          unless data.key?(key)
+            raise "Data for key #{key} not provided."
+          end
+        end
+        execute(data['action'], data['hostname'], data['ip'], data['containerId'])
+
+      elsif data.is_a?(Array)
+        hosts = get_hosts
+
+        # initially remove all entries
+        hosts.elements.delete_if do |element|
+          if valid_entry?(element)
+            log.info 'Removing entry for ' + element.name
+            true
+          end
+        end
+
+        # add recieved entries
+        data.each do |entry|
+          add_entry(entry, hosts)
+          hosts.write
+        end
+
+        hosts.write
+
+      end
+    end
+
+    def add_entry(entry, hosts)
+      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
+      end
+    end
+
+    def execute(action, hostname, ip, container_id = nil)
+      hosts = get_hosts
+
+      if action == 'create'
+        hosts.elements.each do |element|
+          if valid_entry?(element) && hostname == element.name
+            raise "Entry already exists! (#{ip} #{hostname})"
+          end
+        end
+
+        comment = HostManager.comment_prefix + (container_id ? " Container ID: #{container_id}" : '')
+
+        hosts.elements << Hosts::Entry.new(ip, hostname, :comment => comment)
+        hosts.write
+
+      elsif action == 'delete'
+        hosts.elements.delete_if do |element|
+          if valid_entry?(element)
+            if hostname == element.name
+              log.info 'Removing entry for ' + element.name
+              true
+            end
+          end
+        end
+
+        hosts.write
+      else
+        raise 'No valid action specified.'
+      end
+    end
+
+    private
+
+    def sanitize_host_value(value)
+      value.sub(/^\//, '').gsub(/_/, '-')
+    end
+
+  end
+
+  class Server < Base
+    def run(ip, port)
+      HostManager.log.info "Running on host manager service on #{ip}:#{port}"
+      @tcp_server = TCPServer.new ip, port
+
+      loop {
+
+        client = @tcp_server.accept
+        content = client.gets
+
+        log.debug("Recieved data: #{content.to_s.strip}")
+
+        begin
+          unless content.to_s.chomp.strip.empty?
+            data = JSON.parse(content)
+            update_hosts_file(data)
+          end
+
+        rescue => e
+          log.error("Caught exception attempting to execute with data #{content}. #{e}")
+        end
+
+        client.close
+      }
+
+    end
+
+    def self.create(ip, port)
+      server = self.new
+      server.run(ip, port)
+    end
+  end
+
+  class Client < Base
+
+    def initialize(ip, port)
+      @socket = TCPSocket.new(ip, port)
+    end
+
+    def close
+      log.info('Closing client connection.')
+      @socket.close
+    end
+
+    def sync_hosts(container_data)
+      data = build_hosts_data(container_data)
+
+      begin
+        update_hosts_file(data)
+
+        `service dnsmasq restart`
+
+      rescue => e
+        log.error("Caught exception attempting to write to hosts file with data #{data.to_json}. #{e}")
+      end
+
+      send(data)
+    end
+
+    def send(data)
+      log.info("Sending data via client: #{data.to_json}")
+      @socket.write data.to_json + "\n"
+    end
+
+    def self.create(ip, port)
+      self.new(ip, port)
+    end
+  end
+
+end

data/lib/launch-control

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+require 'docker'
+require 'yaml'
+
+
+# build up hash of id => project name
+id_project_hash = {}
+Docker::Container.all(all: true, filters: { status: ["running"] }.to_json).each do |container|
+  # puts container.info['id']
+  # puts container.info['Labels']['com.docker.compose.project'].inspect
+
+  id_project_hash[container.info['id']] = container.info['Labels']['com.docker.compose.project']
+  # puts container.info['NetworkSettings']['IPAddress']
+  # puts container.info.to_yaml
+end
+
+
+module HostManager
+  def self.register(hostname, ip)
+    entry = "#{ip} #{hostname}"
+    puts entry
+  end
+end
+
+Docker::Network.all.each do |network|
+  # puts network.info['Options'].inspect
+  #   puts network.inspect
+  network.info['Containers'].each do |pair|
+    id = pair[0]
+    container = pair[1]
+    ip = container['IPv4Address'][/[^\/]+/]
+    if id_project_hash.key?(id) and id_project_hash[id]
+      project_name = id_project_hash[id]
+      HostManager.register("#{container['Name']}.#{project_name}.local", ip)
+    elsif
+      HostManager.register("#{container['Name']}.local", ip)
+    end
+  end
+end
+
+# Docker::Event.stream { |event|
+#   # respond to all events
+#   puts event.Attributes.name;
+# }

data/lib/server.rb

@@ -0,0 +1,3 @@
+require_relative 'host-manager'
+
+HostManager::Server.create('0.0.0.0', 2991)

data/lib/vagrant-dnsdock-hostupdater.rb

@@ -0,0 +1,10 @@
+require 'bundler'
+
+begin
+  require 'vagrant'
+rescue LoadError
+  Bundler.require(:default, :development)
+end
+
+require 'vagrant-dnsdock-hostupdater/plugin'
+require 'vagrant-dnsdock-hostupdater/command'

data/lib/version.rb

@@ -0,0 +1,5 @@
+module Vagrant
+  module DnsdockHostUpdater
+    VERSION = '0.0.24'.freeze
+  end
+end

data/vagrant-dnsdock-hostupdater.gemspec

@@ -11,9 +11,9 @@ DNSDock should be configured on the guest machine to enable containers to resolv
   DESCRIPTION
   s.authors         = ['Brian Coit']
   s.email           = 'brian.coit@cellosignal.com'
-  s.files           = Dir['{lib}'] + ['Rakefile', 'Gemfile', 'Gemfile.lock', 'vagrant-dnsdock-hostupdater.gemspec']
+  s.files           = Dir['{lib}/**'] + ['Rakefile', 'Gemfile', 'Gemfile.lock', 'vagrant-dnsdock-hostupdater.gemspec']
   s.executables     = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.require_paths   = ['lib/**']
+  s.require_paths   = ['lib']
   s.homepage        = 'https://bitbucket.org/briancoit'
   s.license         = 'ISC'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsdock-hostupdater
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Brian Coit
@@ -64,6 +64,13 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
+- lib/client.rb
+- lib/event-watcher.rb
+- lib/host-manager.rb
+- lib/launch-control
+- lib/server.rb
+- lib/vagrant-dnsdock-hostupdater.rb
+- lib/version.rb
 - vagrant-dnsdock-hostupdater.gemspec
 homepage: https://bitbucket.org/briancoit
 licenses:
@@ -72,7 +79,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib/**
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="