percheron 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4445d20c93033c570134361013fe728e544003fd
-  data.tar.gz: 10758084ea92c594af6fdb6f3e97ccb97bb5ff2d
+  metadata.gz: a3d390c7370c3f9ed4da778a0c5bff35a0bb1a3e
+  data.tar.gz: db80598848ec004fcd08433c973a2c4df01fcfbf
 SHA512:
-  metadata.gz: 17d9f87847470b2b2fd05d5715bcbc2c191fabafd86b4171bdf5b47eca8e8568faa379bd0041e7d123e7ac035db69b48f05b6dbf09c497b6377184bd914dcbba
-  data.tar.gz: be4a053a63c1c07206c5660ea8106cdb8549582ecd6e8fff713ed95149dee195a7adfb4345b51ff120f47e31960a3980565a0bf1616bc6bb3e0161d93edd384b
+  metadata.gz: 6072c3f0c9c2761014a1a2c53279cc08c43c7d48929a7bfb4ad80169a4a073b4eef9a351c5cd61d81fae61c9e8e5f8f8292796e8dd403f2182b0443f9709d6b4
+  data.tar.gz: 92733cea3b69b070ec201e61d01f35e14d6d426b39d6da4f07b90839a68bdfa577d2c13efc779baa65a898516f799139fc23be6ce3e2fc42d8bf17311ae406ec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.7.15 / 2015-08-06
+
+* Allow --force to be used when recreating
+* Don't specify a default set of DNS servers
+* Updated consul example in README
+
 ## v0.7.14 / 2015-08-06
 
 * When executing scripts, pass -x for more insight

data/README.md

@@ -123,17 +123,17 @@ stacks:
     units:
       - name: master
         version: 1.0.0
-        docker_image: progrium/consul:latest
-        start_args: "-server -bootstrap -ui-dir /ui"
+        docker_image: gliderlabs/consul-server:0.5
+        start_args: [ "-bootstrap", "-client", "0.0.0.0", "-data-dir", "/data", "-ui-dir", "/ui" ]
         ports:
           - 8500:8500
           - 8600:53/udp
       - name: agent
         version: 1.0.0
         instances: 2
-        docker_image: progrium/consul:latest
-        start_args: "-server -join master"
-        dependant_unit_names:
+        docker_image: gliderlabs/consul-agent:0.5
+        start_args: [ "-join", "master" ]
+        dependent_unit_names:
           - master
 ```
 
@@ -142,9 +142,12 @@ stacks:
 ```bash
 percheron start consul-stack
 
-I, [2015-05-21T19:25:05.975964 #35449]  INFO -- : Starting 'master' unit
-I, [2015-05-21T19:25:06.676782 #35449]  INFO -- : Starting 'agent1' unit
-I, [2015-05-21T19:25:07.167997 #35449]  INFO -- : Starting 'agent2' unit
+I, [2015-08-06T22:36:46.536424 #45026]  INFO -- : Creating 'consul-stack:master' unit
+I, [2015-08-06T22:36:46.851682 #45026]  INFO -- : Starting 'consul-stack:master' unit
+I, [2015-08-06T22:36:47.861800 #45026]  INFO -- : Creating 'consul-stack:agent1' unit
+I, [2015-08-06T22:36:48.221852 #45026]  INFO -- : Starting 'consul-stack:agent1' unit
+I, [2015-08-06T22:36:48.929909 #45026]  INFO -- : Creating 'consul-stack:agent2' unit
+I, [2015-08-06T22:36:49.378310 #45026]  INFO -- : Starting 'consul-stack:agent2' unit
 ```
 
 5) Show the status

data/lib/percheron/actions/create.rb

@@ -46,14 +46,15 @@ module Percheron
         end
 
         def host_config_options
-          {
+          config = {
             'HostConfig'    => {
               'PortBindings'  => port_bindings,
               'Links'         => unit.links,
-              'Binds'         => unit.volumes,
-              'Dns'           => unit.dns
+              'Binds'         => unit.volumes
             }
           }
+          config['Dns'] = unit.dns unless unit.dns.empty?
+          config
         end
 
         def options

data/lib/percheron/actions/recreate.rb

@@ -4,14 +4,15 @@ module Percheron
 
       include Base
 
-      def initialize(unit, start: false)
+      def initialize(unit, start: false, force: false)
         @unit = unit
         @start = start
+        @force = force
       end
 
       def execute!
         results = []
-        if recreate?
+        if recreate? || force?
           results << recreate!
           results << start!
         else
@@ -22,8 +23,9 @@ module Percheron
 
       private
 
-        attr_reader :unit, :start
+        attr_reader :unit, :start, :force
         alias_method :start?, :start
+        alias_method :force?, :force
 
         def recreate?
           !unit.versions_match? || !unit.dockerfile_md5s_match?

data/lib/percheron/commands/recreate.rb

@@ -3,10 +3,11 @@ module Percheron
     class Recreate < Abstract
 
       default_create_parameters!
+      option([ '-f', '--force' ], :flag, 'Force purge and create', default: false)
 
       def execute
         super
-        stack.recreate!(unit_names: unit_names, start: start?)
+        stack.recreate!(unit_names: unit_names, start: start?, force: force?)
       end
     end
   end

data/lib/percheron/stack.rb

@@ -79,8 +79,8 @@ module Percheron
       execute!(Actions::Create, dependant_units_for(unit_names), start: start)
     end
 
-    def recreate!(unit_names: [], start: false)
-      execute!(Actions::Recreate, filter_unit_names(unit_names), start: start)
+    def recreate!(unit_names: [], start: false, force: false)
+      execute!(Actions::Recreate, filter_unit_names(unit_names), start: start, force: force)
     end
 
     def purge!(unit_names: [], force: false)

data/lib/percheron/unit.rb

@@ -7,8 +7,7 @@ module Percheron
     def_delegators :unit_config, :name, :pseudo_name, :docker_image
     def_config_item_with_default :unit_config, [], :env, :ports, :volumes,
                                  :dependant_unit_names, :pre_build_scripts,
-                                 :post_start_scripts, :start_args
-    def_config_item_with_default :unit_config, %w(127.0.0.1 8.8.8.8), :dns
+                                 :post_start_scripts, :start_args, :dns
     def_config_item_with_default :unit_config, true, :startable
 
     def initialize(config, stack, unit_name)

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.7.14'
+  VERSION = '0.7.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Ash McKenzie