nutkins 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9873753bcc6bffb9546adf4022433732facc78c0
-  data.tar.gz: 15bfa779ab8115550d137f02ebb1591524ff4763
+  metadata.gz: 13286e4b9d44c4a6f6a1c79d0b2073065db3556f
+  data.tar.gz: fe66e353f7d07e804d484dae0cb23e7dfe9c200d
 SHA512:
-  metadata.gz: 0ec0681915beb261b91a511ec5f5bcd79b46722df1f230d5cbb3caf025ba6182ea99ce236f2a4bf0f8b82fd1666a7bb0824f6a1bff79d16fdeab5f257f261527
-  data.tar.gz: cd44f7e126e9feaf8253d0c0b6c94874b712ba168857657bcec282897761de689ba659d4ffb0a3e2d43ad3857b78f93da8636403536bf891f83b02d9e6a6130a
+  metadata.gz: be3e0c9f9d0f1ada791f94419bd6d9a421100f250b0efa8747250706b7f76be60232b32ae4285da1b686bb2231e3ea641a0bfed850edc8f5b9d9df43840b5c7d
+  data.tar.gz: 92d9fc54b1d4f38b5984abbc622a4ae550d53c2a3f673b1461544edc9eccda11b36e8b38bb623ee0250271f9b228997ec8ca94434ce0aa1fc4e1560307beed13

data/lib/nutkins/docker_builder.rb

@@ -5,16 +5,15 @@ require "digest"
 module Nutkins::Docker::Builder
   Docker = Nutkins::Docker
 
-  def self.build cfg
-    base = cfg["base"]
+  def self.build cfg, base_tag = nil
+    base = base_tag || cfg["base"]
     raise "to use build commands you must specify the base image" unless base
 
     # TODO: build cache from this and use to determine restore point
     # Docker.run 'inspect', tag, stderr: false
-
     unless Docker.run 'inspect', base, stderr: false
       puts "getting base image"
-      Docker.run 'pull', base, stdout: true
+      raise "could not find base image #{base}" unless Docker.run 'pull', base, stdout: true
     end
 
     # the base image to start rebuilding from
@@ -53,7 +52,16 @@ module Nutkins::Docker::Builder
           # ensure checksum of each file is embedded into run command
           # if any file changes the cache is dirtied
           run_args = '#(nop) add ' + add_files.map do |src|
-            src + ':' + Digest::MD5.file(src).to_s
+            if File.directory? src
+              md5 = Digest::MD5.new
+              Dir.glob("#{src}/**/*").each do |file|
+                md5.update(File.read file)
+              end
+              hash = md5.hexdigest
+            else
+              hash = Digest::MD5.file(src).to_s
+            end
+            src + ':' + hash
           end.push(add_files_dest).join(' ')
         when "cmd", "entrypoint", "env", "expose", "label", "onbuild", "user", "volume", "workdir"
           env_args = cmd + ' ' + (cmd_args.kind_of?(String) ? cmd_args : JSON.dump(cmd_args))

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/lib/nutkins.rb

@@ -69,7 +69,8 @@ module Nutkins
 
       if cfg.dig "build", "commands"
         # if build commands are available use nutkins built-in builder
-        Docker::Builder::build cfg
+        base_cfg ||= config_for_image base
+        Docker::Builder::build cfg, base_cfg && base_cfg['tag']
       else
         # fallback to `docker build` which is less good
         if not Docker.run 'build', '-t', cfg['latest_tag'], '-t', tag, img_dir, stdout: true
@@ -83,7 +84,7 @@ module Nutkins
           puts "deleting previous image #{prev_image_id}"
           Docker.run "rmi", prev_image_id
         else
-          puts "image is identical to cached version"
+          puts "unchanged image: #{tag}"
         end
       elsif image_id
         puts "created new image #{image_id}"
@@ -317,7 +318,7 @@ module Nutkins
       end
     end
 
-    private
+  private
     def get_etcd_container_name
       repository = @config.repository
       repository && "nutkins-etcd-#{repository}"
@@ -344,8 +345,9 @@ module Nutkins
       img_cfg['latest_tag'] = get_tag img_cfg
       img_cfg['tag'] = img_cfg['latest_tag'] + ':' + img_cfg['version']
 
+      # base isn't the full tag name in the case of local references!!
       base = img_cfg['base']
-      raise "#{img_cfg_path} must include `base' field" unless  base
+      raise "#{img_cfg_path} must include `base' field" unless base
       @img_configs[path] = img_cfg
     end
 
@@ -377,7 +379,6 @@ module Nutkins
       Dir.glob("#{path}/{volumes,secrets}/*.gpg")
     end
 
-    private
     def rm_etcd_docker_container existing
       raise 'could not delete existing container' unless Docker.run 'rm', existing if existing
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutkins
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - James Pike