dapp 0.27.2 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89b8d4526cea7d52e65da52a8f820d57b2c8b3d
-  data.tar.gz: cf18d0448c6bb51ada30b15d38c3ace94d36196d
+  metadata.gz: 4131d8f9a16abec783b77dde8b67133d2195cf2a
+  data.tar.gz: 33983c730f2ca76db4ccb8fce001d29d75de1070
 SHA512:
-  metadata.gz: f9366275d1b264accbb4b261d7571597d91b0a00a0dc23ae851f79071e80b3118d31debe6709ddcc896cae1a0c69d93451971da3f470299707476233972dd49c
-  data.tar.gz: 676e2185ce05f47b0d2e85ac8a345f9a4df91bb90df4bf5fadc96ce5e1cac433aa2a05831b4268fb6c911a471eaeb5f94579ade04dcb1aa1c1feeee60d476ef3
+  metadata.gz: 005d14ed32da6a142565bf95e2d9f32598ea5903d6d9a815078fb385830c3848e3623a4fe8b4caccc526188b90c11033580be3237766773ee471930a05caa55f
+  data.tar.gz: 5b2be0e66e1fd2a6801b9a05683f25ce21c75fef41af25e4558422c3bed8a9d20c30c54be54086b2f999838d3720db1eb12249a7d0c793352200d89c9c9b72d7

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,6 +101,26 @@ module Dapp
         end
       end
 
+      def tag_should_not_be_pushed?(tag)
+        return true unless registry_tags.include?(tag)
+        registry_tag_parent = registry.image_history(tag, name)['container_config']['Image']
+        registry_tag_parent == last_stage.image.built_id
+      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)

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/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.27.2"
+  VERSION = "0.27.3"
   BUILD_CACHE_VERSION = 28
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -741,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell