dapp 0.26.11 → 0.26.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad3b933a1f79acd0841ffb4cc918cbe2693d8e0
-  data.tar.gz: a3918df3a773f3906fc84f3a7e4d0f7476649a6e
+  metadata.gz: 150f425d2a33e65251409283bc05c659364f7b06
+  data.tar.gz: 6e41c8fb2e4bc849a2bbad4eec88ca47fe49d9ba
 SHA512:
-  metadata.gz: 74e2f0689361ae78a406e094d27c89250a07033e4289cd5e8678b9ad17b14a9745caa7c33833a5195e86467c85e7c031d0b3b212e52efea56f311a8799b3717b
-  data.tar.gz: 3c2e509abf0aaf169a3e9132f511cf0b4991e62fee11908a3fbd2c914304e39cde27d5a723c8468d45dee85cebc4f7f5efb2a1bc2f4850a90e6c180de85dd515
+  metadata.gz: e46039d285fd2c158dc3d4e1370133660385d4b4936c4fca865692ccad3ae125ca9176e4efd073b260b36e71da080eef0f51fa44063f40281aba230402ed7ab5
+  data.tar.gz: 94a3d4ee06c7a99963709b760593e69814fe0feb58d61ba60b12102ac5e8656cb6b01bc64b45b9105b034575fbf3664f440857aadb42a4bf81802b8196f52d5b

data/lib/dapp/dimg/build/stage/base.rb

@@ -189,8 +189,10 @@ module Dapp
             commits[git_artifact] ||= begin
               if image.built?
                 image.labels[dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash)]
-              else
+              elsif g_a_stage? && !empty?
                 git_artifact.latest_commit
+              elsif prev_stage
+                prev_stage.layer_commit(git_artifact)
               end
             end
           end

data/lib/dapp/dimg/build/stage/ga_base.rb

@@ -10,7 +10,7 @@ module Dapp
               image.add_volume "#{dimg.tmp_path('patches')}:#{dimg.container_tmp_path('patches')}:ro"
 
               dimg.git_artifacts.each do |git_artifact|
-                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => git_artifact.latest_commit)
+                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => layer_commit(git_artifact))
                 image.add_command git_artifact.send(apply_command_method, self)
               end
             end

data/lib/dapp/dimg/build/stage/ga_latest_patch.rb

@@ -28,7 +28,9 @@ module Dapp
           private
 
           def commit_list
-            dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
+            dimg.git_artifacts
+              .select { |ga| ga.repo.commit_exists?(prev_stage.layer_commit(ga)) && ga.patch_any_changes?(self) }
+              .map(&method(:layer_commit))
           end
 
           def git_artifacts_dev_patch_hashes

data/lib/dapp/dimg/dapp/command/common.rb

@@ -125,6 +125,7 @@ module Dapp
           end
 
           def remove_base(query_format, ids, force: false)
+            return if ids.empty?
             force_option = force ? ' -f' : ''
             log(ids.join("\n")) if log_verbose? || dry_run?
             run_command(format(query_format, force_option: force_option, ids: ids.join(' ')))

data/lib/dapp/dimg/docker_registry/base.rb

@@ -35,7 +35,6 @@ module Dapp
         end
 
         def image_delete(tag)
-          image_blobs(tag).each { |hash| blob_delete(hash.values.first) }
           api_request(repo_suffix, "/manifests/#{image_digest(tag)}",
                       method: :delete,
                       expects: [202, 404],
@@ -54,10 +53,6 @@ module Dapp
                           headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' }).headers['Docker-Content-Digest']
         end
 
-        def image_blobs(tag)
-          manifest_v1(tag)['fsLayers']
-        end
-
         def manifest_v1(tag)
           api_request(repo_suffix, "/manifests/#{tag}")
         end
@@ -67,11 +62,6 @@ module Dapp
                       headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
         end
 
-        def blob_delete(id)
-          api_request(repo_suffix, "/blobs/#{id}",
-                      method: :delete, expects: [202, 404])
-        end
-
         def api_request(*uri, **options)
           JSON.load(raw_api_request(*uri, **options).body)
         end

data/lib/dapp/dimg/git_repo/base.rb

@@ -104,12 +104,12 @@ module Dapp
 
         def patches(from, to, paths: [], exclude_paths: [], **kwargs)
           diff(from, to, **kwargs).patches.select do |patch|
-            ignore_patch?(patch, paths: paths, exclude_paths: exclude_paths)
+            !ignore_patch?(patch, paths: paths, exclude_paths: exclude_paths)
           end
         end
 
         def ignore_patch?(patch, paths: [], exclude_paths: [])
-          !ignore_path?(patch.delta.new_file[:path], paths: paths, exclude_paths: exclude_paths)
+          ignore_path?(patch.delta.new_file[:path], paths: paths, exclude_paths: exclude_paths)
         end
 
         def entries(commit, paths: [], exclude_paths: [])

data/lib/dapp/dimg/git_repo/local.rb

@@ -48,9 +48,9 @@ module Dapp
           delta_new_file = patch.delta.new_file
           args = [delta_new_file[:path], paths: paths, exclude_paths: exclude_paths]
           if nested_git_repository_mode?(delta_new_file[:mode])
-            !ignore_directory?(*args)
+            ignore_directory?(*args)
           else
-            !ignore_path?(*args)
+            ignore_path?(*args)
           end
         end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.11"
-  BUILD_CACHE_VERSION = 27
+  VERSION = "0.26.12"
+  BUILD_CACHE_VERSION = 27.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.11
+  version: 0.26.12
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout