blubber 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2517350f75864848e423e31bb1dcd2da032a554c64965fc1b475440179e701ac
-  data.tar.gz: 892b7d17789623ebd122a13e69616efb4c5d85b93672811971b61c9da6842960
+  metadata.gz: 2484c94b32da5b9915155e5e79cabbbdb1e7b13cf0d6b4be56819e97faa673d4
+  data.tar.gz: 76f0b0b06e6d4e72274969f4e44c468f09edda884e90b7ee31b6e5f03fc6ffa8
 SHA512:
-  metadata.gz: 89d8f8ad7e407a23c1e3e97cb9cbb5ff87135479b574c467904f968c4222b2d43f3b2b8e2727be7224401ce62a03ea5d2be4ba246e3ad855eece45d18c08b896
-  data.tar.gz: 96935b945fc1aad084a9617043b72abbf799416ca1e098ccdee9e446c783f8e5f85e2135cbc80c9a18d9b48c8ef8ae142425b0af78ee70f9fb59066afd81cfdd
+  metadata.gz: 74148c5d3fc3c3206235a162ad9501d14ff96149b2166769fa9b8d3780006c9a2dd1f7358a9b5eb100d59bb1caf6da7c78c9d8ef2e3e2a5913666f9bdc5b512e
+  data.tar.gz: 9d82634efd869b5457062e11277aa14b49b1df4053e5806c957e709aa1b8c8a4ba942e87cb37be0d1da2747b21b59a7661a5e14e2a564f29c4cb17e001492bd3

data/lib/blubber/builder.rb

@@ -43,11 +43,6 @@ module Blubber
     end
 
     def build(layer)
-      # NOTICE : Speed up build for fresh slave
-      tagger.tags.each do |tag|
-        runner.run("docker pull #{Tagger.docker_registry}/#{layer}:#{tag}")
-      end
-
       status = nil
       Dir.chdir(layer) do
         status = runner.run('docker build .') do |stdout, _, _|

data/lib/blubber/cli.rb

@@ -6,7 +6,7 @@ module Blubber
   class Cli < Thor
     desc 'build', 'Builds all found Docker images'
     def build
-      Flow.build
+      exit(Flow.build) # Fails to build if any layer fails
     end
   end
 end

data/lib/blubber/flow.rb

@@ -7,7 +7,9 @@ require 'blubber/tagger'
 module Blubber
   class Flow
     def self.build(layers = nil)
-      layers ||= Dir['**/*/Dockerfile'].map { |d| File.dirname(d) }
+      layers ||= changed_layers
+
+      puts "Building layers: #{layers.join(', ')}"
 
       images = layers.map { |layer| Flow.new(layer: layer).run }
 
@@ -25,6 +27,25 @@ module Blubber
       images.all? { |image| image[:success] }
     end
 
+    def self.changed_layers
+      @changed_layers ||= begin
+        if ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT'] != '' && ENV['BUILD_ALL'] != 'true'
+          commit = ENV['GIT_COMMIT'] || `git rev-parse HEAD`.strip
+          changes = `git diff --name-only #{ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT']}..#{commit}`.split("\n")
+          paths = []
+          changes.each do |path|
+            dirs = File.dirname(path).split(File::SEPARATOR)
+            dirs.map.with_index { |_, i| dirs[0..i].join(File::SEPARATOR) }.reverse.each do |dir|
+              paths << dir if File.exist?(File.join(dir, 'Dockerfile'))
+            end
+          end
+          paths
+        else
+          Dir['**/*/Dockerfile'].map { |d| File.dirname(d) }.sort
+        end
+      end
+    end
+
     def initialize(layer:)
       @layer = layer
     end
@@ -43,6 +64,7 @@ module Blubber
     attr_reader :layer
 
     def logger
+      STDOUT.sync = true
       @logger ||= Logger.new(STDOUT).tap do |logger|
         logger.progname = layer
         logger.formatter = proc do |severity, datetime, progname, msg|

data/lib/blubber/tagger.rb

@@ -23,13 +23,16 @@ module Blubber
     end
 
     def project
-      "#{Tagger.docker_registry}/#{layer}"
+      [
+        Tagger.docker_registry,
+        *layer.split('/').select { |p| p[/[a-z0-9]+/] }
+      ].join('/')
     end
 
     def tags
       @tags ||= begin
         tags = []
-        tags << "#{commit}#{dirty? ? '-dirty' : ''}"
+        tags << commit
 
         unless dirty?
           tags << branch_name.gsub(/[^\w.-]/, '_') unless branch_name.empty?
@@ -38,7 +41,7 @@ module Blubber
 
         tags << File.read("#{layer}/Dockerfile").scan(/LABEL version=([\w][\w.-]*)/)
 
-        tags.flatten
+        tags.flatten.map { |t| "#{t}#{dirty? ? '-dirty' : ''}" }
       end
     end
 

data/lib/blubber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blubber
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline