pygmy 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a01f3f5b33da9753d56df7bb251645e1cf0cc961
-  data.tar.gz: a9e466393f6eaeb238e55f6ee9716dd01e7dd6f2
+  metadata.gz: 9a1b8a1903a6a6c6635518fb6b6a8a9225db999c
+  data.tar.gz: 81beb618fec3d6955b000a5808d0df49dad002a5
 SHA512:
-  metadata.gz: 1902a2367c478394ef2b162aace8a8a5dc2c36a0e1ca20c4e46b066949742ee5b34e7e5f5e6924efe2018ba249a3ee0b9b4c65840b5aba6daab54fa001d119e5
-  data.tar.gz: c032329491620456068a6fa59f127b325963dcb60d323626ec5662e4e153d3c385a3aea1a632997c9e02ae4d5fe33acc5f09e317cabe7c8dff49d490312743b3
+  metadata.gz: 38cc7bdd63d1d441c3c2b074e91bb8ff791d75a07a4be801938a375729652e836ebfe801510a33785287fce38a929fb709aee84990fe767aaca704289d89cb26
+  data.tar.gz: e9b2904bde94f66c555cc38f184d5333f3ccea8697ef9f82f6158ac177577b43d7ff3f12b96e97e2dee2f96fdbab3e95780e9235b31c84dc99cb6db620f6d1be

data/bin/pygmy

@@ -8,7 +8,7 @@ require 'pygmy'
 class PygmyBin < Thor
   class_option :verbose, type: :boolean, aliases: '-v', default: false
 
-  desc 'up', 'Bring up pygmy services (dnsmasq, resolv, ssh-agent)'
+  desc 'up', 'Bring up pygmy services (dnsmasq, haproxt, resolv, ssh-agent)'
   long_desc <<-LONGDESC
     Bring up pygmy services (dnsmasq, haproxy, resolv, ssh-agent)
 
@@ -21,8 +21,11 @@ class PygmyBin < Thor
     - ssh-agent: to keep the ssh-agent at one single place, so that all other docker containers
       can consume the ssh key.
 
-    Additionally the local resolver (/etc/resolv.conf) will be configured to use the dnsmasq
-    instance as a nameserver
+    On Linux: The local resolver (/etc/resolv.conf) will be configured to use the dnsmasq
+    instance as a nameserver.
+
+    On Mac: A resolver file (/etc/resolver/docker.amazee.io) will be created to use the dnsmasq
+    instance as a nameserver for all *.docker.amazee.io domains.
 
     > $ pygmy up
   LONGDESC
@@ -30,6 +33,15 @@ class PygmyBin < Thor
     exec_up(options)
   end
 
+  desc 'update', 'Pulls Docker Images and recreates the Containers'
+  long_desc <<-LONGDESC
+    Runs 'docker pull' on the Docker images in order to get their newest versions.
+    After that restarts all containers with removing them, so that the new images are used.
+  LONGDESC
+  def update
+    exec_update
+  end
+
   desc 'stop', 'Stop all pygmy services'
   long_desc <<-LONGDESC
     Stops all pygmy services.  Can optionally pass [-d|--destroy]
@@ -94,6 +106,13 @@ class PygmyBin < Thor
 
   private
 
+  def exec_update
+    Pygmy::Haproxy.pull
+    Pygmy::SshAgent.pull
+    puts "Done. Recreating containers...".yellow
+    exec_stop({:destroy => true})
+    exec_up({})
+  end
 
   def exec_up(options)
 

data/lib/pygmy/docker_service.rb

@@ -18,6 +18,16 @@ module Pygmy
       self.running?
     end
 
+    def pull
+      puts "Pulling Docker Image #{Shellwords.escape(self.image_name)}".yellow
+      success = Sh.run_command("docker pull #{Shellwords.escape(self.image_name)}").success?
+      unless success
+        raise RuntimeError.new(
+          "Failed to update #{self.container_name}.  Command #{self.pull_cmd} failed"
+        )
+      end
+    end
+
     def running?(container_name = self.container_name)
       !!(self.ps =~ /#{container_name}/)
     end

data/lib/pygmy/resolv_osx.rb

@@ -13,7 +13,7 @@ module Pygmy
     end
 
     def self.create_resolver?
-      puts "setting up DNS resolution, this may require sudo".green
+      puts "setting up DNS resolution and loopback alias IP, this may require sudo".green
       unless self.resolver_dir.directory?
         self.system!("creating #{self.resolver_dir}", "sudo", "mkdir", "-p", self.resolver_dir)
       end
@@ -23,11 +23,15 @@ module Pygmy
         self.system!("creating #{self.resolver_file}", "sudo", "cp", f.path, self.resolver_file)
         self.system!("creating #{self.resolver_file}", "sudo", "chmod", "644", self.resolver_file)
       end
+      self.system!("creating loopback IP alias 172.16.172.16", "sudo", "ifconfig", "lo0", "alias", "172.16.172.16")
       self.system!("restarting mDNSResponder", "sudo", "killall", "mDNSResponder")
     end
 
     def self.clean?
+      puts "Removing resolver file and loopback alias IP, this may require sudo".green
       self.system!("removing resolverfile", "sudo", "rm", "-f", self.resolver_file)
+      self.system!("removing loopback IP alias 172.16.172.16", "sudo", "ifconfig", "lo0", "-alias", "172.16.172.16")
+      system!("restarting mDNSResponder", "sudo", "killall", "mDNSResponder")
     end
 
     def self.system!(step, *args)

data/lib/pygmy/version.rb

@@ -1,4 +1,4 @@
 module Pygmy
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
   DATE    = '2016-04-30'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pygmy
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Michael Schmid