percheron 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d3fe11591f768bc7d5867837dc546b679bbf85
-  data.tar.gz: ab113fd870d359c2ba383340feab044e42861b26
+  metadata.gz: 6fbe3a87573ec876ad368663f4da08e86f3d6f79
+  data.tar.gz: eedbde7448d4abd3a6e1e03d8ffa6da063ff98af
 SHA512:
-  metadata.gz: d0b7b65daffc775d0606a6d11a5b55a26387c0d4362f4a75fcded15f4c9246ec35a732b992dc14f944a12d1521ce017665b5f762c81aba8b1cd99eab72c8f377
-  data.tar.gz: 3426521b489b6b91d5bbfad9b9fae2bae6c9e89bfaa3d3dfa2b75552571bbcbf5943c5d02d4cd992d0975be21c10ac071e6282c326c4bfe482c85d80e038b069
+  metadata.gz: bc7b8ed5c1f1e8fe65bc277873be95626488870e17c9ae0a8f1312783e169ea4f5b32385512daeb6292dc2dea3faf3b6bb59bd3850da06308f9e51187f51fce8
+  data.tar.gz: 309648e78a99688bca4f863de0ddc859b98331346db2287ea1d1daf91b45b66e08dafad90a1501744ff4b23b4c1531b214a95b4bd5ceabb10fabc2004708ec08

data/README.md

@@ -34,6 +34,8 @@ It is intended to be used in a test, development or prototyping scenario.
 * Version control of images and units
 * Partial template (liquid) support within `.percheron.yml`
 * Generate Graphviz dependency graphs dynamically based purely on your `.percheron.yml`
+* Support for userdata key/value pairs
+* Support for secrets in YML format
 * Written in Ruby :)
 
 ## Supported platforms
@@ -115,10 +117,6 @@ gem install percheron
 
 ```yaml
 ---
-docker:
-  host: "https://boot2docker:2376"
-  ssl_verify_peer: false
-
 stacks:
   - name: consul-stack
     description: A demo consul stack with one master and two agents
@@ -234,7 +232,7 @@ To debug Percheron and Docker, set the `DOCKER_DEBUG=true` environment variable.
 * [Rails](https://github.com/ashmckenzie/percheron-rails#quickstart) - Rails 4.2, PostgreSQL, redis, HAProxy and postfix
 * [Redis](https://github.com/ashmckenzie/percheron-redis#quickstart) - Redis cluster + sentinel, master, two slaves and tools
 * [Torrent](https://github.com/ashmckenzie/percheron-torrent#quickstart) - Tracker (chihaya), seeder (aria2) and three peers (aria2)
-* [SaltStack](https://github.com/ashmckenzie/percheron-saltstack#quickstart) - SaltStack v2015.5.0 with master and two minions
+* [SaltStack](https://github.com/ashmckenzie/percheron-saltstack#quickstart) - SaltStack with master and two minions
 
 ## Testing
 

data/lib/percheron/actions/build.rb

@@ -4,9 +4,10 @@ module Percheron
 
       include Base
 
-      def initialize(unit, nocache: false, exec_scripts: true)
+      def initialize(unit, nocache: false, forcerm: false, exec_scripts: true)
         @unit = unit
         @nocache = nocache
+        @forcerm = forcerm
         @exec_scripts = exec_scripts
       end
 
@@ -21,14 +22,14 @@ module Percheron
 
       private
 
-        attr_reader :unit, :nocache, :exec_scripts
+        attr_reader :unit, :nocache, :forcerm, :exec_scripts
         alias_method :exec_scripts?, :exec_scripts
 
         def options
           {
             'dockerfile'  => dockerfile,
             't'           => unit.image_name,
-            'forcerm'     => true,
+            'forcerm'     => forcerm,
             'nocache'     => nocache
           }
         end
@@ -52,7 +53,7 @@ module Percheron
         end
 
         def write_out_temp_dockerfile!
-          options = { 'secrets' => Config.secrets }
+          options = { 'secrets' => Config.secrets, 'userdata' => Config.userdata }
           content = Liquid::Template.parse(unit.dockerfile.read).render(options)
           File.open(temp_dockerfile, 'w') { |f| f.write(content) }
         end

data/lib/percheron/commands/build.rb

@@ -3,10 +3,11 @@ module Percheron
     class Build < Abstract
 
       default_parameters!
+      option('--forcerm', :flag, 'force removal of intermediate containers', default: false)
 
       def execute
         super
-        stack.build!(unit_names: unit_names)
+        stack.build!(unit_names: unit_names, forcerm: forcerm?)
       end
     end
   end

data/lib/percheron/config.rb

@@ -47,6 +47,14 @@ module Percheron
       secrets_file ? Hashie::Mash.new(YAML.load_file(secrets_file)) : {}
     end
 
+    def self.userdata
+      instance.userdata
+    end
+
+    def userdata
+      contents.userdata || {}
+    end
+
     def self.docker
       instance.docker
     end

data/lib/percheron/stack.rb

@@ -67,10 +67,10 @@ module Percheron
       execute!(Actions::Restart, filter_unit_names(unit_names))
     end
 
-    def build!(unit_names: [])
+    def build!(unit_names: [], forcerm: false)
       unit_names = dependant_units_for(unit_names)
       exec_on_dependant_units_for(unit_names) do |unit|
-        Actions::Build.new(unit).execute!
+        Actions::Build.new(unit, forcerm: forcerm).execute!
       end
       nil
     end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.7.12'
+  VERSION = '0.7.13'
 end

metadata

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