blubber 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2484c94b32da5b9915155e5e79cabbbdb1e7b13cf0d6b4be56819e97faa673d4
-  data.tar.gz: 76f0b0b06e6d4e72274969f4e44c468f09edda884e90b7ee31b6e5f03fc6ffa8
+  metadata.gz: 2fc43a8d69b7d4d93a797191b720892f7b8ad4a853f450d6177cb32064a03ebc
+  data.tar.gz: b56d0301887bc29ab7dbf07328db241f7230afc7ee101cf475350250187c1850
 SHA512:
-  metadata.gz: 74148c5d3fc3c3206235a162ad9501d14ff96149b2166769fa9b8d3780006c9a2dd1f7358a9b5eb100d59bb1caf6da7c78c9d8ef2e3e2a5913666f9bdc5b512e
-  data.tar.gz: 9d82634efd869b5457062e11277aa14b49b1df4053e5806c957e709aa1b8c8a4ba942e87cb37be0d1da2747b21b59a7661a5e14e2a564f29c4cb17e001492bd3
+  metadata.gz: cb8a7675b4959203c9675d3dd1e35cc645924f8e66638e5c94d5b4a9f1d19eea96aba8c662a32c8e51e0c1b5b9d6adae157c5b471cfc274849644d2602cec767
+  data.tar.gz: b6696c0121a6cc8fef1e541c1e4b0216171e7cfa476370b06a9fee5e74400d4fa2eab841aa129e03230413b43e5253d1fe004db7eed36eb85510bc414dd8b4fe

data/lib/blubber/builder.rb

@@ -45,7 +45,7 @@ module Blubber
     def build(layer)
       status = nil
       Dir.chdir(layer) do
-        status = runner.run('docker build .') do |stdout, _, _|
+        status = runner.run("docker build --build-arg BRANCH_NAME=#{tagger.branch_name} .") do |stdout, _, _|
           if stdout && (m = stdout.match(/Successfully built ([a-z0-9]{12})/))
             build_ids[layer] = m[1]
           end

data/lib/blubber/flow.rb

@@ -29,8 +29,13 @@ module Blubber
 
     def self.changed_layers
       @changed_layers ||= begin
-        if ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT'] != '' && ENV['BUILD_ALL'] != 'true'
+        if ENV.fetch('GIT_PREVIOUS_SUCCESSFUL_COMMIT', '').empty? || ENV['BUILD_ALL'] == 'true'
+          Dir['**/*/Dockerfile'].map { |d| File.dirname(d) }.sort
+        else
           commit = ENV['GIT_COMMIT'] || `git rev-parse HEAD`.strip
+
+          puts "Detecting changed layers between #{ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT']}..#{commit}"
+
           changes = `git diff --name-only #{ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT']}..#{commit}`.split("\n")
           paths = []
           changes.each do |path|
@@ -40,8 +45,6 @@ module Blubber
             end
           end
           paths
-        else
-          Dir['**/*/Dockerfile'].map { |d| File.dirname(d) }.sort
         end
       end
     end

data/lib/blubber/runner.rb

@@ -12,15 +12,18 @@ module Blubber
         # read each stream from a new thread
         { out: stdout, err: stderr }.each do |key, stream|
           Thread.new do
-            until (line = stream.gets).nil?
-              # yield the block depending on the stream
-              if key == :out
-                logger.info line.strip
-                yield line, nil, thread if block_given?
-              else
-                logger.error line.strip
-                yield nil, line, thread if block_given?
+            begin
+              until (line = stream.gets).nil?
+                # yield the block depending on the stream
+                if key == :out
+                  logger.info line.strip
+                  yield line, nil, thread if block_given?
+                else
+                  logger.error line.strip
+                  yield nil, line, thread if block_given?
+                end
               end
+            rescue IOError
             end
           end
         end

data/lib/blubber/tagger.rb

@@ -22,13 +22,6 @@ module Blubber
       push
     end
 
-    def project
-      [
-        Tagger.docker_registry,
-        *layer.split('/').select { |p| p[/[a-z0-9]+/] }
-      ].join('/')
-    end
-
     def tags
       @tags ||= begin
         tags = []
@@ -45,6 +38,17 @@ module Blubber
       end
     end
 
+    def project
+      [
+        Tagger.docker_registry,
+        *layer.split('/').select { |p| p[/[a-z0-9]+/] }
+      ].join('/')
+    end
+
+    def branch_name
+      @branch_name ||= ENV['BRANCH_NAME'] || `git rev-parse HEAD | git branch -a --contains | sed -n 2p | cut -d'/' -f 3-`.strip
+    end
+
     private
 
     attr_reader :layer, :image_id, :logger
@@ -65,10 +69,6 @@ module Blubber
       @commit ||= ENV['GIT_COMMIT'] || `git rev-parse HEAD`.strip
     end
 
-    def branch_name
-      @branch_name ||= ENV['BRANCH_NAME'] || `git rev-parse HEAD | git branch -a --contains | sed -n 2p | cut -d'/' -f 3-`.strip
-    end
-
     def push
       status = true
       tags.each do |tag|

data/lib/blubber/version.rb

@@ -1,3 +1,3 @@
 module Blubber
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blubber
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Mikko Kokkonen