lib/percheron/actions/build.rb in percheron-0.6.4 vs lib/percheron/actions/build.rb in percheron-0.7.0

@@ -2,46 +2,48 @@
   module Actions
     class Build
 
       include Base
 
-      def initialize(container, nocache: false)
+      def initialize(container, nocache: false, exec_scripts: true)
         @container = container
         @nocache = nocache
+        @exec_scripts = exec_scripts
       end
 
       def execute!
         results = []
-        results << build!
+        results << build! if container.buildable?
         results.compact.empty? ? nil : container
       end
 
       private
 
-        attr_reader :container, :nocache
+        attr_reader :container, :nocache, :exec_scripts
+        alias_method :exec_scripts?, :exec_scripts
 
-        def build_opts
+        def options
           {
             'dockerfile'  => container.dockerfile.basename.to_s,
             't'           => container.image_name,
             'forcerm'     => true,
             'nocache'     => nocache
           }
         end
 
         def build!
           in_working_directory(base_dir) do
-            execute_pre_build_scripts!  unless container.pre_build_scripts.empty?
+            execute_pre_build_scripts!
             $logger.info "Building '#{container.image_name}' image"
-            Docker::Image.build_from_dir(base_dir, build_opts) do |out|
+            Docker::Image.build_from_dir(base_dir, options) do |out|
               $logger.debug '%s' % [ out.strip ]
             end
           end
         end
 
         def execute_pre_build_scripts!
+          return nil if !exec_scripts? && container.pre_build_scripts.empty?
           ExecLocal.new(container, container.pre_build_scripts, 'PRE build').execute!
         end
-
     end
   end
 end