dapp 0.27.4 → 0.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1f27a244e9ea4322280e79e2ea6b0e7c2d02675
-  data.tar.gz: 9c8f56e544461a4017f133f07f5496350ce057ca
+  metadata.gz: d1e643078bf570017b9c6e9094ad4931c7abfd65
+  data.tar.gz: e2c385bc8931033054991efd1d6bdd4ec007f954
 SHA512:
-  metadata.gz: cd19f60baa8cf98dd7164d28f8bdde8fa9e06fb10d45f2f8a665227c97c288c873663c570f54a7bdbea0036d32ef6650b5d8d8f8dfdf6933186cfe6ce371045c
-  data.tar.gz: 3fb47dd74d293ef7122a2222c3785e8fdd4b0c7687e035cdabcfb2d82fad76c6916c34f70c66cae50df5cbea99981f485387313e1336339b043e2658ce8e927a
+  metadata.gz: fb802f2a3a31e22d6fb7b040d375212b2db356a208c53b15b3e1460ff9cdf6f3dff0bd696ee6bda69891924d4c95e92cc1867656bd3f121aa4589164b657ec05
+  data.tar.gz: 77622c1f4c45722a7026aced780593b7cf1d97a18d239f011e69dc974c6017a4fc22c5d8740cec0f6303d4623f94fb1a6f28416310aa981a4b1404206bb3814e

data/config/en/common.yml

@@ -48,6 +48,7 @@ en:
       export: '[EXPORT]'
       pull: '[PULL]'
       tag: '[TAG]'
+      exist: '[EXIST]'
     warning:
       wrong_using_base_directive: "WARNING: Directive `%{directive}` has declared after dimg_group|dimg|artifact!"
       wrong_using_directive: "WARNING: Directive `%{directive}` has declared after dimg_group|dimg!"

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

@@ -14,7 +14,7 @@ module Dapp
           { ':minikube' => "localhost:5000/#{name}" }
         end
 
-        def dimg_registry(repo)
+        def dimg_registry(repo = option_repo)
           validate_repo_name!(repo)
           ::Dapp::Dimg::DockerRegistry.new(repo)
         end

data/lib/dapp/dimg/dimg.rb

@@ -81,6 +81,12 @@ module Dapp
             dapp.log_step_with_indent(tag_scheme_name) do
               tags.each do |tag|
                 image_name = format(export_format, repo: repo, dimg_name: name, tag: tag)
+
+                if push && tag_should_not_be_pushed?(tag.to_s)
+                  dapp.log_state(image_name, state: dapp.t(code: 'state.exist'))
+                  next
+                end
+
                 export_base!(image_name, push: push) do
                   export_image = build_export_image!(image_name, scheme_name: tag_scheme_name)
                   if push
@@ -95,7 +101,28 @@ module Dapp
         end
       end
 
-      def build_export_image!(image_name, scheme_name:)
+      def tag_should_not_be_pushed?(tag)
+        registry_tags.include?(tag) && begin
+          registry_tag_parent = registry.image_history(tag, name)['container_config']['Image']
+          registry_tag_parent == last_stage.image.built_id
+        end
+      end
+
+      def registry_tags
+        @registry_tags ||= begin
+          if name.nil?
+            registry.nameless_dimg_tags
+          else
+            registry.dimg_tags(name)
+          end
+        end
+      end
+
+      def registry
+        @registry ||= dapp.dimg_registry
+      end
+
+      def  build_export_image!(image_name, scheme_name:)
         Image::Dimg.image_by_name(name: image_name, from: last_stage.image, dapp: dapp).tap do |export_image|
           export_image.add_service_change_label(:'dapp-tag-scheme' => scheme_name)
           export_image.add_service_change_label(:'dapp-dimg' => true)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.27.4"
+  VERSION = "0.27.5"
   BUILD_CACHE_VERSION = 28
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -741,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell