percheron 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddfc86ead3b58968ec07cccf692a841643a45060
-  data.tar.gz: a09225865990c275d6812e26ab9dd2496d1171f6
+  metadata.gz: c71cf3ea4de4f1a1d09949fcb09b55384594c707
+  data.tar.gz: 20c785069bff584a52244d90496e5f8038f22ee4
 SHA512:
-  metadata.gz: a8a42293482b1d1ac38891aa44a2dbb1dd7d1d1000a1e2879ee78e07230e3af1d8f0747d8d8e9ab945f4534338362d561e6f2dfc53df2100311139c9934fb726
-  data.tar.gz: c153bc4ca7252f604143e96d55a6e5d8f0fe7684cf14e893657e00ab150fd227d4e78ccbe88169a85832325492a57d958d185f40b5198ae6b1389c6f724c2a04
+  metadata.gz: 5dc2ec2e73b073c075b66980dc74dea1ccc65be4686c98c4f381e850717aa4bdfe4cd61541e0bb05f482efbf72b833c3c08ab85cbd7169326bc592803e5ad379
+  data.tar.gz: e8ec04f906e78f28bae614abd4fa2a2b16c795ba11e6fe8b23e89d197570dd86180182b6fd8b81b6accf8eb9017ec0efbf27aa9743461906db98f88ac0c3545e

data/README.md

@@ -1,7 +1,7 @@
 # Percheron
 
 [![Gem Version](https://badge.fury.io/rb/percheron.svg)](http://badge.fury.io/rb/percheron)
-[![Travis CI](https://travis-ci.org/ashmckenzie/percheron.svg)](https://travis-ci.org/ashmckenzie/percheron)
+[![Build Status](https://travis-ci.org/ashmckenzie/percheron.svg?branch=master)](https://travis-ci.org/ashmckenzie/percheron)
 [![Code Climate GPA](https://codeclimate.com/github/ashmckenzie/percheron/badges/gpa.svg)](https://codeclimate.com/github/ashmckenzie/percheron)
 [![Test Coverage](https://codeclimate.com/github/ashmckenzie/percheron/badges/coverage.svg)](https://codeclimate.com/github/ashmckenzie/percheron)
 [![Dependency Status](https://gemnasium.com/ashmckenzie/percheron.svg)](https://gemnasium.com/ashmckenzie/percheron)

data/bin/percheron

@@ -16,10 +16,12 @@ if ENV['VERBOSE'] == 'true'
   logger_level = Logger::INFO
 end
 
-if ENV['DEBUG'] == 'true'
+if ENV['DEBUG'] == 'true' || ENV['DOCKER_DEBUG'] == 'true'
   require 'pry-byebug'
   require 'awesome_print'
   logger_level = Logger::DEBUG
+
+  Docker.logger = $logger if ENV['DOCKER_DEBUG'] == 'true'
 end
 
 $logger.level = logger_level

data/lib/percheron/container/actions/base.rb

@@ -0,0 +1,21 @@
+module Percheron
+  module Container
+    module Actions
+      module Base
+
+        private
+
+          def base_dir
+            container.dockerfile.dirname.to_s
+          end
+
+          def in_working_directory(new_dir)
+            old_dir = Dir.pwd
+            Dir.chdir(new_dir)
+            yield
+            Dir.chdir(old_dir)
+          end
+      end
+    end
+  end
+end

data/lib/percheron/container/actions/build.rb

@@ -1,23 +1,17 @@
-require 'open3'
-
 module Percheron
   module Container
     module Actions
       class Build
 
+        include Base
+
         def initialize(container, nocache: false)
           @container = container
           @nocache = nocache
         end
 
         def execute!
-          in_working_directory(base_dir) do
-            execute_pre_build_scripts!
-            $logger.debug "Building '#{container.image}'"
-            Docker::Image.build_from_dir(base_dir, build_opts) do |out|
-              $logger.debug '%s' % [ out.strip ]
-            end
-          end
+          build!
         end
 
         private
@@ -27,28 +21,28 @@ module Percheron
           def build_opts
             {
               'dockerfile'  => container.dockerfile.basename.to_s,
-              't'           => container.image,
+              't'           => container.image_name,
               'forcerm'     => true,
               'nocache'     => nocache
             }
           end
 
-          def base_dir
-            container.dockerfile.dirname.to_s
-          end
+          def build!
+            in_working_directory(base_dir) do
+              execute_pre_build_scripts!
 
-          def in_working_directory(new_dir)
-            old_dir = Dir.pwd
-            Dir.chdir(new_dir)
-            yield
-            Dir.chdir(old_dir)
+              $logger.debug "Building '#{container.image_name}'"
+              Docker::Image.build_from_dir(base_dir, build_opts) do |out|
+                $logger.debug '%s' % [ out.strip ]
+              end
+            end
           end
 
           def execute_pre_build_scripts!
             container.pre_build_scripts.each do |script|
               in_working_directory(base_dir) do
                 command = '/bin/bash -x %s 2>&1' % Pathname.new(File.expand_path(script))
-                $logger.debug "Executing '#{command}' for '#{container.name}' container"
+                $logger.debug "Executing PRE build '#{command}' for '#{container.name}' container"
                 Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
                   while line = stdout_err.gets
                     $logger.debug line.strip

data/lib/percheron/container/actions/create.rb

@@ -3,18 +3,16 @@ module Percheron
     module Actions
       class Create
 
+        include Base
+
         def initialize(container)
           @container = container
         end
 
         def execute!
-          unless image_exists?
-            $logger.debug "Creating '#{container.image}' image"
-            Container::Actions::Build.new(container).execute!
-          end
-
-          $logger.debug "Creating '#{container.name}' container"
-          Docker::Container.create(create_opts)
+          build!
+          insert_post_start_scripts!
+          create!
         end
 
         private
@@ -24,7 +22,7 @@ module Percheron
           def create_opts
             {
               'name'          => container.name,
-              'Image'         => container.image,
+              'Image'         => container.image_name,
               'Hostname'      => container.name,
               'Env'           => container.env,
               'ExposedPorts'  => container.exposed_ports,
@@ -32,8 +30,24 @@ module Percheron
             }
           end
 
-          def image_exists?
-            Docker::Image.exist?(container.image)
+          def build!
+            unless container.image
+              $logger.debug "Creating '#{container.image_name}' image"
+              Container::Actions::Build.new(container).execute!
+            end
+          end
+
+          def create!
+            $logger.debug "Creating '#{container.name}' container"
+            Docker::Container.create(create_opts)
+          end
+
+          def insert_post_start_scripts!
+            container.post_start_scripts.each do |script|
+              file = Pathname.new(File.expand_path(script, base_dir))
+              new_image = container.image.insert_local('localPath' => file.to_s, 'outputPath' => "/tmp/#{file.basename}")
+              new_image.tag(repo: container.name, tag: container.version.to_s, force: true)
+            end
           end
 
       end

data/lib/percheron/container/actions/recreate.rb

@@ -3,6 +3,8 @@ module Percheron
     module Actions
       class Recreate
 
+        include Base
+
         def initialize(container)
           @container = container
         end
@@ -24,7 +26,7 @@ module Percheron
           def create_opts
             {
               'name'          => temporary_name,
-              'Image'         => container.image,
+              'Image'         => container.image_name,
               'Hostname'      => container.name,
               'Env'           => container.env,
               'ExposedPorts'  => container.exposed_ports,
@@ -36,7 +38,7 @@ module Percheron
             '%s_wip' % container.name
           end
 
-          # FIXME
+          # FIXME: brittle
           def temporary_container_exists?
             temporary_container.info.empty?
           rescue Docker::Error::NotFoundError
@@ -44,8 +46,8 @@ module Percheron
           end
 
           def create_image!
-            unless image_exists?
-              $logger.debug "Creating '#{container.image}' image"
+            unless container.image
+              $logger.debug "Creating '#{container.image_name}' image"
               Container::Actions::Build.new(container).execute!
             end
           end
@@ -89,7 +91,7 @@ module Percheron
           end
 
           def rename_wip_to_current!
-            # FIXME
+            # FIXME: brittle
             $logger.debug "Renaming '#{temporary_name}' container to '#{container.name}'"
             Docker::Container.get(temporary_name).rename(container.name)
           end
@@ -98,10 +100,6 @@ module Percheron
             container.start!
           end
 
-          def image_exists?
-            Docker::Image.exist?(container.image)
-          end
-
           def container_was_running?
             @container_was_running
           end

data/lib/percheron/container/actions/start.rb

@@ -3,14 +3,16 @@ module Percheron
     module Actions
       class Start
 
+        include Base
+
         def initialize(container)
           @container = container
         end
 
         def execute!
           if container.exists?
-            $logger.debug "Starting '#{container.name}'"
-            container.docker_container.start!(start_opts)
+            start!
+            execute_post_start_scripts!
           else
             raise Errors::ContainerDoesNotExist.new
           end
@@ -34,6 +36,22 @@ module Percheron
             }
           end
 
+          def start!
+            $logger.debug "Starting '#{container.name}'"
+            container.docker_container.start!(start_opts)
+          end
+
+          def execute_post_start_scripts!
+            container.post_start_scripts.each do |script|
+              in_working_directory(base_dir) do
+                file = Pathname.new(File.expand_path(script, base_dir))
+                command = '/bin/bash -x /tmp/%s 2>&1' % file.basename
+                $logger.debug "Executing POST create '#{command}' for '#{container.name}' container"
+                container.docker_container.exec(command.split(' '))
+              end
+            end
+          end
+
       end
     end
   end

data/lib/percheron/container/actions/stop.rb

@@ -3,24 +3,30 @@ module Percheron
     module Actions
       class Stop
 
+        include Base
+
         def initialize(container)
           @container = container
         end
 
         def execute!
-          if container.running?
-            $logger.debug "Stopping '#{container.name}'"
-            container.docker_container.stop!
-          else
-            $logger.debug "Not stopping '#{container.name}' container as it's not running"
-            raise Errors::ContainerNotRunning.new
-          end
+          stop!
         end
 
         private
 
           attr_reader :container
 
+          def stop!
+            if container.running?
+              $logger.debug "Stopping '#{container.name}'"
+              container.docker_container.stop!
+            else
+              $logger.debug "Not stopping '#{container.name}' container as it's not running"
+              raise Errors::ContainerNotRunning.new
+            end
+          end
+
       end
     end
   end

data/lib/percheron/container/actions.rb

@@ -1,3 +1,6 @@
+require 'open3'
+
+require 'percheron/container/actions/base'
 require 'percheron/container/actions/stop'
 require 'percheron/container/actions/start'
 require 'percheron/container/actions/create'

data/lib/percheron/container/main.rb

@@ -8,7 +8,7 @@ module Percheron
       def_delegators :container_config, :name
 
       def_config_item_with_default :container_config, false, :auto_recreate
-      def_config_item_with_default :container_config, [], :env, :ports, :volumes, :dependant_container_names, :pre_build_scripts
+      def_config_item_with_default :container_config, [], :env, :ports, :volumes, :dependant_container_names, :pre_build_scripts, :post_start_scripts
 
       alias_method :auto_recreate?, :auto_recreate
 
@@ -25,6 +25,12 @@ module Percheron
       end
 
       def image
+        Docker::Image.get(image_name)
+      rescue Docker::Error::NotFoundError
+        nil
+      end
+
+      def image_name
         '%s:%s' % [ name, version.to_s ]
       end
 

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -211,6 +211,7 @@ files:
 - lib/percheron/config_delegator.rb
 - lib/percheron/container.rb
 - lib/percheron/container/actions.rb
+- lib/percheron/container/actions/base.rb
 - lib/percheron/container/actions/build.rb
 - lib/percheron/container/actions/create.rb
 - lib/percheron/container/actions/recreate.rb