dapp 0.27.24 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92ace8efed7d94bce6963a716dd06bcf250565fa
-  data.tar.gz: 61ad2c2d8022efff30cbe82c25ba788ec1d5a74e
+  metadata.gz: 3dbff2ff0349b92efd0c4662cc5ba5bb9c77a107
+  data.tar.gz: e97fcc44533ceea1d85f3ca6e2384738885c83b9
 SHA512:
-  metadata.gz: dce06b2f76860a3a20864788e1018b22fec7726a606b785cd7b55eb9cb894075ff083bce2060488bb1fd0fcf7d1676020caa0080b0b4ebc8b3b58ad188194c4b
-  data.tar.gz: dc60b638a540429f1622793f78334902adfc92e734ed06f9fed6ee0e649b500e9c612dd050dbcbe59e3ac72faed3c9a7e3d950b5b3f41b10ba19e5b59aaeaaee
+  metadata.gz: 830eb29eb810e75dd9404f44771813b39b5eaffc6a6739f93214d3917138cdc67ecb4f8582da684c28f296158400bae84497854a4dceef89340f7299205a13bc
+  data.tar.gz: 7676eef00836559b62814f9833d4877f6f8dd042a9d936f0b758c2e5127aa6f88c25bf6e2076245c62077239e1a9d84586a6bc5d028b7d0946e3d46891a5fb80

data/config/en/common.yml

@@ -49,6 +49,7 @@ en:
       pull: '[PULL]'
       tag: '[TAG]'
       exist: '[EXIST]'
+      not_exist: '[NOT 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.rb

@@ -52,8 +52,7 @@ require 'dapp/error/config'
 require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/cli'
-require 'dapp/cli/command/options/tag'
-require 'dapp/cli/options/ssh'
+require 'dapp/cli/options/tag'
 require 'dapp/cli/command/base'
 require 'dapp/cli/command/update'
 require 'dapp/cli/command/slug'
@@ -169,6 +168,7 @@ require 'dapp/dimg/build/stage/ga_latest_patch'
 require 'dapp/dimg/build/stage/docker_instructions'
 require 'dapp/dimg/build/stage/ga_artifact_patch'
 require 'dapp/dimg/build/stage/build_artifact'
+require 'dapp/dimg/cli/options/introspection'
 require 'dapp/dimg/cli/command/base'
 require 'dapp/dimg/cli/command/dimg'
 require 'dapp/dimg/cli/command/dimg/build'

data/lib/dapp/cli/options/tag.rb

@@ -0,0 +1,51 @@
+module Dapp
+  class CLI
+    module Options
+      module Tag
+        def self.extended(klass)
+          klass.class_eval do
+            "Add tag (can be used one or more times), specified text will be slugified".tap do |desc|
+              option :tag,
+                      long: '--tag TAG',
+                      description: desc,
+                      default: [],
+                      proc: proc { |v| composite_options(:tags) << v }
+
+              option :tag_slug,
+                      long: '--tag-slug TAG',
+                      description: desc,
+                      default: [],
+                      proc: proc { |v| composite_options(:slug_tags) << v }
+            end
+
+            option :tag_plain,
+                   long: '--tag-plain TAG',
+                   description: "Add tag (can be used one or more times)",
+                   default: [],
+                   proc: proc { |v| composite_options(:plain_tags) << v }
+
+            option :tag_branch,
+                   long: '--tag-branch',
+                   description: 'Tag by git branch',
+                   boolean: true
+
+            option :tag_build_id,
+                   long: '--tag-build-id',
+                   description: 'Tag by CI build id',
+                   boolean: true
+
+            option :tag_ci,
+                   long: '--tag-ci',
+                   description: 'Tag by CI branch and tag',
+                   boolean: true
+
+            option :tag_commit,
+                   long: '--tag-commit',
+                   description: 'Tag by git commit',
+                   boolean: true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dapp/dappfile.rb

@@ -124,12 +124,12 @@ module Dapp
           return if File.exists? dappfile_yml_bin_path
 
           log_process("Downloading dappfile-yml dapp dependency") do
-            location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml")
+            location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml")
 
             tmp_bin_path = File.join(self.class.tmp_base_dir, "dappfile-yml-#{SecureRandom.uuid}")
             ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: dappfile_yml_bin_path)
 
-            checksum_location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml.sha")
+            checksum_location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml.sha")
             tmp_bin_checksum_path = tmp_bin_path + ".checksum"
             ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
 

data/lib/dapp/dimg/artifact.rb

@@ -8,7 +8,11 @@ module Dapp
       def after_stages_build!
       end
 
-      def stage_should_be_introspected?(name)
+      def stage_should_be_introspected_before_build?(name)
+        dapp.options[:introspect_artifact_before] == name
+      end
+
+      def should_be_introspected_after_build?(name)
         dapp.options[:introspect_artifact_stage] == name
       end
 

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

@@ -16,12 +16,10 @@ module Dapp
             group = artifact[:options][:group]
             to = artifact[:options][:to]
 
-            export_folder_name = SecureRandom.uuid
-
-            command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_dimg.name, export_folder_name).to_s, nil, nil, include_paths, exclude_paths)
+            command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_dimg.name, 'data').to_s, nil, nil, include_paths, exclude_paths)
             run_artifact_dimg(artifact_dimg, command)
 
-            command = safe_cp(dimg.container_tmp_path('artifact', artifact_dimg.name, export_folder_name).to_s, to, owner, group, include_paths, exclude_paths)
+            command = safe_cp(dimg.container_tmp_path('artifact', artifact_dimg.name, 'data').to_s, to, owner, group, include_paths, exclude_paths)
             image.add_command command
             image.add_volume "#{dimg.tmp_path('artifact', artifact_dimg.name)}:#{dimg.container_tmp_path('artifact', artifact_dimg.name)}:ro"
           end

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

@@ -50,16 +50,7 @@ module Dapp
           def build!
             prev_stage.build! if prev_stage
             renew             if should_be_renewed?
-            image_build       unless empty?
-            image_introspect  if image_should_be_introspected?
-          end
-
-          def image_introspect
-            if image.built?
-              dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options))
-            else
-              dimg.dapp.log_warning(desc: { code: :introspect_image_impossible, data: { name: name } })
-            end
+            image_build
           end
 
           def save_in_cache!
@@ -233,10 +224,31 @@ module Dapp
 
           def image_build
             prepare_image if image_should_be_prepared?
+
+            introspect_image_before_build if image_should_be_introspected_before_build?
+
             log_image_build do
               dimg.dapp.log_process(log_name,
                                     process: dimg.dapp.t(code: 'status.process.building'),
                                     short: should_not_be_detailed?) { image.build! }
+            end unless empty?
+
+            introspect_image_after_build if image_should_be_introspected_after_build?
+          end
+
+          def introspect_image_before_build
+            introspect_image_default(from_image)
+          end
+
+          def introspect_image_after_build
+            introspect_image_default(image)
+          end
+
+          def introspect_image_default(introspected_image)
+            if introspected_image.built?
+              dimg.introspect_image!(image: introspected_image.built_id, options: image.send(:prepared_options))
+            else
+              dimg.dapp.log_warning(desc: { code: :introspect_image_impossible, data: { name: name } })
             end
           end
 

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

@@ -11,14 +11,19 @@ module Dapp
           end
 
           def dependencies
-            @dependencies ||= [dimg.git_artifacts.map(&:paramshash).join, reset_commits]
+            @dependencies ||= [dimg.git_artifacts.map(&:paramshash).join, reset_commits, dev_mode_dependencies]
+          end
+
+          def dev_mode_dependencies
+            return unless dimg.dev_mode?
+            dimg.git_artifacts.map(&:latest_commit)
           end
 
           protected
 
           def reset_commits
             regex = Regexp.union(RESET_COMMIT_MESSAGES)
-            dimg.git_artifacts.map { |git_artifact| git_artifact.repo.find_commit_id_by_message(regex) }.compact.sort.uniq
+            dimg.git_artifacts.map { |git_artifact| git_artifact.repo.find_commit_id_by_message(regex) }.sort.uniq.compact
           end
 
           def apply_command_method

data/lib/dapp/dimg/build/stage/mod/logging.rb

@@ -81,7 +81,15 @@ module Dapp
             end
 
             def image_should_be_introspected?
-              dimg.stage_should_be_introspected?(name) && !dimg.dapp.dry_run?
+              image_should_be_introspected_after_build? || image_should_be_introspected_before_build?
+            end
+
+            def image_should_be_introspected_before_build?
+              dimg.stage_should_be_introspected_before_build?(name) && !dimg.dapp.dry_run?
+            end
+
+            def image_should_be_introspected_after_build?
+              dimg.stage_should_be_introspected_after_build?(name) && !dimg.dapp.dry_run?
             end
           end
         end # Mod

data/lib/dapp/dimg/builder/ansible.rb

@@ -155,7 +155,7 @@ module Dapp
             image.add_command [ansible_playbook_bin,
                                container_workdir.join('playbook.yml'),
                                ENV['ANSIBLE_ARGS']
-                              ].join(' ')
+                              ].compact.join(' ')
           end
         end
       end

data/lib/dapp/dimg/cli/cli.rb

@@ -1 +1,2 @@
 ::Dapp::CLI.send(:include, ::Dapp::Dimg::CLI::Command)
+::Dapp::CLI.send(:include, ::Dapp::Dimg::CLI::Options)

data/lib/dapp/dimg/cli/command/dimg/bp.rb

@@ -15,18 +15,7 @@ BANNER
 
         # build options
 
-        introspected_stages = [
-          :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
-          :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact,
-          :g_a_pre_setup_patch, :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions
-        ]
-        artifact_introspected_stages = [
-          :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
-          :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact,
-          :g_a_pre_setup_patch, :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
-        ]
-
-        extend ::Dapp::CLI::Options::Ssh
+        extend ::Dapp::Dimg::CLI::Options::Introspection
 
         option :tmp_dir_prefix,
               long: '--tmp-dir-prefix PREFIX',
@@ -41,25 +30,12 @@ BANNER
               long: '--git-artifact-branch BRANCH',
               description: 'Default branch to archive artifacts from'
 
-        option :introspect_error,
-              long: '--introspect-error',
-              boolean: true,
-              default: false
-
-        option :introspect_before_error,
-              long: '--introspect-before-error',
-              boolean: true,
-              default: false
-
-        option :introspect_stage,
-              long: '--introspect-stage STAGE',
-              description: "Introspect one of the following stages (#{list_msg_format(introspected_stages)})",
-              proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, introspected_stages) } }
-
-        option :introspect_artifact_stage,
-              long: '--introspect-artifact-stage STAGE',
-              description: "Introspect one of the following stages (#{list_msg_format(artifact_introspected_stages)})",
-              proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, artifact_introspected_stages) } }
+        option :ssh_key,
+              long: '--ssh-key SSH_KEY',
+              description: ['Enable only specified ssh keys ',
+                            '(use system ssh-agent by default)'].join,
+              default: nil,
+              proc: ->(v) { composite_options(:ssh_key) << v }
 
         option :build_context_directory,
               long: '--build-context-directory DIR_PATH',
@@ -77,7 +53,7 @@ BANNER
 
         # push options
 
-        extend ::Dapp::CLI::Command::Options::Tag
+        extend ::Dapp::CLI::Options::Tag
 
         option :with_stages,
                long: '--with-stages',

data/lib/dapp/dimg/cli/command/dimg/build.rb

@@ -11,21 +11,8 @@ Usage:
 
 Options:
 BANNER
-        artifact_stages = [
-          :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
-          :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact,
-          :g_a_pre_setup_patch, :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
-        ]
 
-        before_stage_proc = proc do |stages|
-          proc do |val|
-            val_sym = val.to_sym
-            STAGE_PROC.call(stages[1..-1]).call(val_sym)
-            stages[stages.index(val_sym) - 1]
-          end
-        end
-
-        extend ::Dapp::CLI::Options::Ssh
+        extend ::Dapp::Dimg::CLI::Options::Introspection
 
         option :tmp_dir_prefix,
                long: '--tmp-dir-prefix PREFIX',
@@ -40,35 +27,12 @@ BANNER
                long: '--git-artifact-branch BRANCH',
                description: 'Default branch to archive artifacts from'
 
-        option :introspect_error,
-               long: '--introspect-error',
-               boolean: true,
-               default: false
-
-        option :introspect_before_error,
-               long: '--introspect-before-error',
-               boolean: true,
-               default: false
-
-        option :introspect_stage,
-               long:        '--introspect-stage STAGE',
-               description: "Introspect one of the following stages (#{list_msg_format(DIMG_STAGES)})",
-               proc:        STAGE_PROC.call(DIMG_STAGES)
-
-        option :introspect_before,
-               long:        '--introspect-before STAGE',
-               description: "Introspect stage before one of the following stages (#{list_msg_format(DIMG_STAGES[1..-1])})",
-               proc:        before_stage_proc.call(DIMG_STAGES)
-
-        option :introspect_artifact_stage,
-               long:        '--introspect-artifact-stage STAGE',
-               description: "Introspect one of the following stages (#{list_msg_format(artifact_stages)})",
-               proc:        STAGE_PROC.call(artifact_stages)
-
-        option :introspect_artifact_before,
-               long:        '--introspect-artifact-before STAGE',
-               description: "Introspect stage before one of the following stages (#{list_msg_format(artifact_stages[1..-1])})",
-               proc:        before_stage_proc.call(artifact_stages)
+        option :ssh_key,
+               long: '--ssh-key SSH_KEY',
+               description: ['Enable only specified ssh keys ',
+                             '(use system ssh-agent by default)'].join,
+               default: nil,
+               proc: ->(v) { composite_options(:ssh_key) << v }
 
         option :build_context_directory,
                long: '--build-context-directory DIR_PATH',
@@ -83,13 +47,6 @@ BANNER
                long: '--force-save-cache',
                boolean: true,
                default: false
-
-        def cli_options(**kwargs)
-          super.tap do |config|
-            config[:introspect_stage] ||= config[:introspect_before]
-            config[:introspect_artifact_stage] ||= config[:introspect_artifact_before]
-          end
-        end
       end
     end
   end

data/lib/dapp/dimg/cli/command/dimg/push.rb

@@ -11,7 +11,7 @@ Usage:
 
 Options:
 BANNER
-        extend ::Dapp::CLI::Command::Options::Tag
+        extend ::Dapp::CLI::Options::Tag
 
         option :lock_timeout,
                long: '--lock-timeout TIMEOUT',

data/lib/dapp/dimg/cli/command/dimg/run.rb

@@ -12,14 +12,18 @@ Usage:
 
 Options:
 BANNER
-
-        extend ::Dapp::CLI::Options::Ssh
-
         option :stage,
                long:        '--stage STAGE',
                description: "Run one of the following stages (#{list_msg_format(DIMG_STAGES)})",
                proc:        STAGE_PROC.call(DIMG_STAGES)
 
+        option :ssh_key,
+               long: '--ssh-key SSH_KEY',
+               description: ['Enable only specified ssh keys ',
+                             '(use system ssh-agent by default)'].join,
+               default: nil,
+               proc: ->(v) { composite_options(:ssh_key) << v }
+
         def read_options(args)
           self.class.cli_wrapper(self) do
             args.each_with_index do |arg, i|

data/lib/dapp/dimg/cli/command/dimg/tag.rb

@@ -11,7 +11,7 @@ Usage:
 
 Options:
 BANNER
-        extend ::Dapp::CLI::Command::Options::Tag
+        extend ::Dapp::CLI::Options::Tag
 
         def run(argv = ARGV)
           self.class.parse_options(self, argv)

data/lib/dapp/dimg/cli/options/introspection.rb

@@ -0,0 +1,45 @@
+module Dapp::Dimg::CLI
+  module Options
+    module Introspection
+      def self.extended(klass)
+        artifact_stages = [
+          :from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
+          :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact,
+          :g_a_pre_setup_patch, :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
+        ]
+
+        klass.class_eval do
+          option :introspect_error,
+                 long: '--introspect-error',
+                 boolean: true,
+                 default: false
+
+          option :introspect_before_error,
+                 long: '--introspect-before-error',
+                 boolean: true,
+                 default: false
+
+          option :introspect_stage,
+                 long:        '--introspect-stage STAGE',
+                 description: "Introspect one of the following stages (#{list_msg_format(klass.const_get(:DIMG_STAGES))})",
+                 proc:        klass.const_get(:STAGE_PROC).call(klass.const_get(:DIMG_STAGES))
+
+          option :introspect_before,
+                 long:        '--introspect-before STAGE',
+                 description: "Introspect stage before one of the following stages (#{list_msg_format(klass.const_get(:DIMG_STAGES))})",
+                 proc:        klass.const_get(:STAGE_PROC).call(klass.const_get(:DIMG_STAGES))
+
+          option :introspect_artifact_stage,
+                 long:        '--introspect-artifact-stage STAGE',
+                 description: "Introspect one of the following stages (#{list_msg_format(artifact_stages)})",
+                 proc:        klass.const_get(:STAGE_PROC).call(artifact_stages)
+
+          option :introspect_artifact_before,
+                 long:        '--introspect-artifact-before STAGE',
+                 description: "Introspect stage before one of the following stages (#{list_msg_format(artifact_stages)})",
+                 proc:        klass.const_get(:STAGE_PROC).call(artifact_stages)
+        end
+      end
+    end
+  end
+end

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

@@ -150,9 +150,15 @@ module Dapp
             @kube_images ||= namespaces['items'].map do |item|
               item['metadata']['name']
             end.map do |ns|
-              client.with_namespace(ns) do
-                client.pod_list['items'].map do |pod|
-                  pod['spec']['containers'].map{ |cont| cont['image'] }
+              [].tap do |arr|
+                client.with_namespace(ns) do
+                  arr << pod_images(client)
+                  arr << cronjob_images(client)
+                  arr << daemonset_images(client)
+                  arr << deployment_images(client)
+                  arr << job_images(client)
+                  arr << replicaset_images(client)
+                  arr << replicationcontroller_images(client)
                 end
               end
             end.flatten.uniq.select do |image|
@@ -160,6 +166,57 @@ module Dapp
             end
           end
 
+          # pod items[] spec containers[] image
+          def pod_images(client)
+            client.pod_list['items'].map do |item|
+              item['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+          # cronjob items[] spec jobTemplate spec template spec containers[] image
+          def cronjob_images(client)
+            client.cronjob_list['items'].map do |item|
+              item['spec']['jobTemplate']['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+          # daemonsets   items[] spec template spec containers[] image
+          def daemonset_images(client)
+            client.daemonset_list['items'].map do |item|
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+          # deployment   items[] spec template spec containers[] image
+          def deployment_images(client)
+            client.deployment_list['items'].map do |item|
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+          # job          items[] spec template spec containers[] image
+          def job_images(client)
+            client.job_list['items'].map do |item|
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+          # replicasets  items[] spec template spec containers[] image
+          def replicaset_images(client)
+            client.replicaset_list['items'].map do |item|
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+          # replicationcontroller    items[] spec template spec containers[] image
+          def replicationcontroller_images(client)
+            client.replicationcontroller_list['items'].map do |item|
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+            end
+          end
+
+
+
           def without_kube?
             !!options[:without_kube]
           end

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

@@ -3,6 +3,10 @@ module Dapp
     module Dapp
       module Command
         module Common
+          def dimgstage_push_tag_format
+            'dimgstage-%{signature}'
+          end
+
           protected
 
           def dapp_project_dimgstages
@@ -203,7 +207,7 @@ module Dapp
           end
 
           def dimgstage_push_format
-            '%{repo}:dimgstage-%{signature}'
+            "%{repo}:#{dimgstage_push_tag_format}"
           end
 
           def with_stages?

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

@@ -6,7 +6,7 @@ module Dapp
           def run(stage_name, docker_options, command)
             one_dimg!
             setup_ssh_agent
-            dimg(config: build_configs.first, ignore_git_fetch: true, should_be_built: stage_name.nil?)
+            dimg(config: build_configs.first, ignore_git_fetch: true, should_be_built: stage_name.nil?, ignore_signature_auto_calculation: true)
               .run_stage(stage_name, docker_options, command)
           end
         end

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

@@ -7,11 +7,10 @@ module Dapp
             protected
 
             def repo_detailed_dimgs_images(registry)
-              repo_dimgs_images(registry).select do |dimg|
+              repo_dimgs_images(registry).each do |dimg|
                 image_history = registry.image_history(dimg[:tag], dimg[:dimg])
                 dimg[:parent] = image_history['container_config']['Image']
-                dimg[:labels] = image_history['config']['Labels'] || {}
-                dimg[:labels]['dapp'] == name
+                dimg[:labels] = image_history['config']['Labels']
               end
             end
 

data/lib/dapp/dimg/dapp/command/stages/flush_local.rb

@@ -8,6 +8,9 @@ module Dapp
               lock("#{name}.images") do
                 log_step_with_indent('flush stages') { remove_project_images(dapp_project_dimgstages) }
               end
+
+              dapp_containers_flush_by_label("dapp=#{name}")
+              dapp_dangling_images_flush_by_label("dapp=#{name}")
             end
           end
         end

data/lib/dapp/dimg/dapp/dimg.rb

@@ -3,11 +3,25 @@ module Dapp
     module Dapp
       module Dimg
         def dimg(config:, **kwargs)
-          (@dimgs ||= {})[config._name] ||= ::Dapp::Dimg::Dimg.new(config: config, dapp: self, **kwargs)
+          dimg_after_define_hook(config: config, **kwargs) do
+            (@dimg ||= {})[config._name] ||= ::Dapp::Dimg::Dimg.new(config: config, dapp: self, **kwargs)
+          end
         end
 
         def artifact_dimg(config:, **kwargs)
-          (@artifacts_dimgs ||= {})[config._name] ||= ::Dapp::Dimg::Artifact.new(config: config, dapp: self, **kwargs)
+          dimg_after_define_hook(config: config, **kwargs) do
+            (@artifacts_dimgs ||= {})[config._name] ||= ::Dapp::Dimg::Artifact.new(config: config, dapp: self, **kwargs)
+          end
+        end
+
+        def dimg_after_define_hook(**kwargs)
+          should_be_built = kwargs[:should_be_built] || false
+          yield.tap do |dimg|
+            if should_be_built && dimg.should_be_built != should_be_built
+              dimg.enable_should_be_built
+              dimg.should_be_built!
+            end
+          end
         end
 
         def dimg_layer(config:, **kwargs)

data/lib/dapp/dimg/dimg.rb

@@ -20,10 +20,18 @@ module Dapp
 
         @ignore_git_fetch                  = ignore_git_fetch
         @ignore_signature_auto_calculation = ignore_signature_auto_calculation
-        @should_be_built                   = should_be_built
 
         @dapp._terminate_dimg_on_terminate(self)
 
+        enable_should_be_built if should_be_built
+        should_be_built!
+      end
+
+      def enable_should_be_built
+        @should_be_built = true
+      end
+
+      def should_be_built!
         raise Error::Dimg, code: :dimg_not_built if should_be_built?
       end
 
@@ -67,7 +75,14 @@ module Dapp
       def export_stages!(repo, format:)
         dapp.lock("#{dapp.name}.images", readonly: true) do
           export_images.each do |stage_image|
-            image_name = format(format, repo: repo, signature: stage_image.name.split(':').last)
+            signature = stage_image.name.split(':').last
+            image_name = format(format, repo: repo, signature: signature)
+
+            if dimgstage_should_not_be_pushed?(format(dapp.dimgstage_push_tag_format, signature: signature))
+              dapp.log_state(image_name, state: dapp.t(code: 'state.exist'))
+              next
+            end
+
             export_base!(image_name, push: true) do
               stage_image.export!(image_name)
             end
@@ -101,6 +116,10 @@ module Dapp
         end
       end
 
+      def dimgstage_should_not_be_pushed?(signature)
+        registry_dimgstages_tags.include?(signature)
+      end
+
       def tag_should_not_be_pushed?(tag)
         registry_tags.include?(tag) && begin
           registry_tag_parent = registry.image_history(tag, name)['container_config']['Image']
@@ -118,12 +137,17 @@ module Dapp
         end
       end
 
+      def registry_dimgstages_tags
+        @registry_dimgstages_tags ||= registry.dimgstages_tags
+      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.untag! if export_image.built?
           export_image.add_service_change_label(:'dapp-tag-scheme' => scheme_name)
           export_image.add_service_change_label(:'dapp-dimg' => true)
           export_image.build!
@@ -144,8 +168,15 @@ module Dapp
       def import_stages!(repo, format:)
         dapp.lock("#{dapp.name}.images", readonly: true) do
           import_images.each do |image|
+            signature = image.name.split(':').last
+            image_name = format(format, repo: repo, signature:signature )
+
+            unless dimgstage_should_not_be_pushed?(format(dapp.dimgstage_push_tag_format, signature: signature))
+              dapp.log_state(image_name, state: dapp.t(code: 'state.not_exist'))
+              next
+            end
+
             begin
-              image_name = format(format, repo: repo, signature: image.name.split(':').last)
               import_base!(image, image_name)
             rescue ::Dapp::Error::Shellout => e
               dapp.log_info ::Dapp::Helper::NetStatus.message(e)
@@ -244,7 +275,11 @@ module Dapp
         dapp.shellout! cmd
       end
 
-      def stage_should_be_introspected?(name)
+      def stage_should_be_introspected_before_build?(name)
+        dapp.options[:introspect_before] == name
+      end
+
+      def stage_should_be_introspected_after_build?(name)
         dapp.options[:introspect_stage] == name
       end
 

data/lib/dapp/dimg/dimg/git_artifact.rb

@@ -31,11 +31,7 @@ module Dapp
         def generate_git_artifacts(repo, **git_artifact_options)
           [].tap do |artifacts|
             artifacts << (artifact = ::Dapp::Dimg::GitArtifact.new(repo, self, **git_artifact_options))
-            if ENV['DAPP_DISABLE_GIT_SUBMODULES']
-              artifacts
-            else
-              artifacts.concat(generate_git_embedded_artifacts(artifact))
-            end
+            artifacts.concat(generate_git_embedded_artifacts(artifact))
           end.select do |artifact|
             !artifact.empty?
           end

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

@@ -29,25 +29,10 @@ module Dapp
             [:realm, :service, :scope].map do |option|
               /#{option}="([[^"].]*)/ =~ header
               next unless Regexp.last_match(1)
-
-              option_value = begin
-                if option == :scope
-                  handle_scope_option(Regexp.last_match(1))
-                else
-                  Regexp.last_match(1)
-                end
-              end
-
-              [option, option_value]
+              [option, Regexp.last_match(1)]
             end.compact.to_h
           end
 
-          def handle_scope_option(resourcescope)
-            resource_type, resource_name, actions = resourcescope.split(":")
-            actions                               = actions.split(",").map { |action| action == "delete" ? "*" : action }.join(",")
-            [resource_type, resource_name, actions].join(":")
-          end
-
           def authorization_auth
             @authorization_auth ||= begin
               if ::Dapp::Dapp.options_with_docker_credentials?

data/lib/dapp/dimg/git_artifact.rb

@@ -91,7 +91,7 @@ module Dapp
         {}.tap do |options|
           options[:name]                = repo.dapp.consistent_uniq_slugify("embedded-#{embedded_rel_path}")
           options[:cwd]                 = embedded_inherit_path(cwd, embedded_rel_path).last
-          options[:to]                  = Pathname(cwd).subpath_of?(embedded_rel_path) ? to : File.join(to, embedded_rel_path)
+          options[:to]                  = File.join(to, embedded_rel_path)
           options[:include_paths]       = embedded_inherit_paths(include_paths, embedded_rel_path)
           options[:exclude_paths]       = embedded_inherit_paths(exclude_paths, embedded_rel_path)
           options[:stages_dependencies] = begin

data/lib/dapp/dimg/image/argument.rb

@@ -100,9 +100,6 @@ module Dapp
           return {} if from.nil?
           [:entrypoint, :cmd].each_with_object({}) do |option, options|
             options[option] = from.config_option(option.to_s.capitalize) || []
-          end.tap do |options|
-            workdir = from.config_option('WorkingDir')
-            options[:workdir] = Array((workdir || '').empty? ? '/' : workdir)
           end
         end
 
@@ -124,7 +121,6 @@ module Dapp
 
         def service_options
           {
-            workdir: '/',
             entrypoint: dapp.bash_bin,
             name: container_name,
             user: '0:0',

data/lib/dapp/kube/cli/command/kube/deploy.rb

@@ -8,9 +8,7 @@ Usage:
 
 Options:
 BANNER
-
-      extend ::Dapp::CLI::Command::Options::Tag
-      extend ::Dapp::CLI::Options::Ssh
+      extend ::Dapp::CLI::Options::Tag
 
       option :namespace,
              long: '--namespace NAME',

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -8,7 +8,7 @@ Usage:
 
 Options:
 BANNER
-      extend ::Dapp::CLI::Command::Options::Tag
+      extend ::Dapp::CLI::Options::Tag
 
       option :namespace,
              long: '--namespace NAME',

data/lib/dapp/kube/cli/command/kube/render.rb

@@ -8,7 +8,7 @@ Usage:
 
 Options:
 BANNER
-      extend ::Dapp::CLI::Command::Options::Tag
+      extend ::Dapp::CLI::Options::Tag
 
       option :namespace,
              long: '--namespace NAME',

data/lib/dapp/kube/cli/command/kube/value_get.rb

@@ -8,7 +8,7 @@ Usage:
 
 Options:
 BANNER
-      extend ::Dapp::CLI::Command::Options::Tag
+      extend ::Dapp::CLI::Options::Tag
 
       option :namespace,
         long: '--namespace NAME',

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -4,8 +4,6 @@ module Dapp
       module Command
         module Deploy
           def kube_deploy
-            setup_ssh_agent
-
             helm_release do |release|
               do_deploy = proc do
                 kube_run_deploy(release)

data/lib/dapp/kube/dapp/command/minikube_setup.rb

@@ -292,6 +292,10 @@ module Dapp
                           {
                             'name' => 'REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY',
                             'value' => '/var/lib/registry'
+                          },
+                          {
+                            'name' => 'REGISTRY_STORAGE_DELETE_ENABLED',
+                            'value' => 'true',
                           }
                         ],
                         'volumeMounts' => [

data/lib/dapp/kube/kubernetes/client.rb

@@ -1,15 +1,57 @@
 module Dapp
   module Kube
     module Kubernetes
+      # TODO endpoints can be gathered from api-server by api discovery.
+      K8S_API_ENDPOINTS = {
+        '1.6' => {
+          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
+          '/apis/apps/v1beta1' => [:deployment, :statefulset, ],
+          '/apis/extensions/v1beta1' => [:replicaset, :daemonset, ],
+          '/apis/batch/v1' => [:job, ],
+          '/apis/batch/v2aplha1' => [:cronjob, ],
+        },
+        '1.7' => {
+          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
+          '/apis/apps/v1beta1' => [:deployment, :statefulset, ],
+          '/apis/extensions/v1beta1' => [:replicaset, :daemonset, ],
+          '/apis/batch/v1' => [:job, ],
+          '/apis/batch/v2aplha1' => [:cronjob, ],
+        },
+        '1.8' => {
+          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
+          '/apis/apps/v1beta2' => [:daemonset, :deployment, :replicaset, :statefulset, ],
+          '/apis/batch/v1' => [:job, ],
+          '/apis/batch/v1beta1' => [:cronjob, ],
+        },
+        '1.9' => {
+          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
+          '/apis/apps/v1' => [:daemonset, :deployment, :replicaset, :statefulset, ],
+          '/apis/batch/v1' => [:job, ],
+          '/apis/batch/v1beta1' => [:cronjob, ],
+        },
+        '1.10' => {
+          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
+          '/apis/apps/v1' => [:daemonset, :deployment, :replicaset, :statefulset, ],
+          '/apis/batch/v1' => [:job, ],
+          '/apis/batch/v1beta1' => [:cronjob, ],
+        },
+        'stable' => {
+          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
+          '/apis/batch/v1' => [:job, ],
+        },
+      }
+
       class Client
         include Helper::YAML
         extend Helper::YAML
 
         ::Dapp::Dapp::Shellout::Base.default_env_keys << 'KUBECONFIG'
 
+        #
         def initialize(namespace: nil)
           @namespace = namespace
           @query_parameters = {}
+          @cluster_version
         end
 
         def namespace
@@ -42,47 +84,61 @@ module Dapp
         # NOTICE: Название метода аналогично kind'у выдаваемого результата.
         # NOTICE: В данном случае в результате kind=DeploymentList.
         # NOTICE: Методы создания/обновления/удаления сущностей kubernetes заканчиваются на '!'. Например, create_deployment!.
+        # В каждом методе происходит выбор api на основе версии кластера
 
-        {
-          '/api/v1' => [:service, :replicationcontroller, :pod],
-          '/apis/extensions/v1beta1' => [:deployment, :replicaset],
-          '/apis/batch/v1' => [:job]
-        }.each do |api, objects|
-          objects.each do |object|
-            define_method :"#{object}_list" do |**query_parameters|
-              request!(:get, "#{api}/namespaces/#{namespace}/#{object}s", **query_parameters)
-            end
+        def resource_endpoint_path(resource)
+          K8S_API_ENDPOINTS[cluster_version()].map do |path, resources|
+            resources.include?(resource) ? path : nil
+          end.compact.first
+        end
 
-            define_method object do |name, **query_parameters|
-              request!(:get, "#{api}/namespaces/#{namespace}/#{object}s/#{name}", **query_parameters)
-            end
+        [
+          :service, :replicationcontroller, :pod, :podtemplate,
+          :daemonset, :deployment, :replicaset, :statefulset,
+          :job,
+          :cronjob,
+        ].each do |resource|
+          define_method :"#{resource}_list" do |**query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:get, "#{api_path}/namespaces/#{namespace}/#{resource}s", **query_parameters)
+          end
 
-            define_method "#{object}_status" do |name, **query_parameters|
-              request!(:get, "#{api}/namespaces/#{namespace}/#{object}s/#{name}/status", **query_parameters)
-            end
+          define_method resource do |name, **query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:get, "#{api_path}/namespaces/#{namespace}/#{resource}s/#{name}", **query_parameters)
+          end
 
-            define_method :"create_#{object}!" do |spec, **query_parameters|
-              request!(:post, "#{api}/namespaces/#{namespace}/#{object}s", body: spec, **query_parameters)
-            end
+          define_method "#{resource}_status" do |name, **query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:get, "#{api_path}/namespaces/#{namespace}/#{resource}s/#{name}/status", **query_parameters)
+          end
 
-            define_method :"replace_#{object}!" do |name, spec, **query_parameters|
-              request!(:put, "#{api}/namespaces/#{namespace}/#{object}s/#{name}", body: spec, **query_parameters)
-            end
+          define_method :"create_#{resource}!" do |spec, **query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:post, "#{api_path}/namespaces/#{namespace}/#{resource}s", body: spec, **query_parameters)
+          end
 
-            define_method :"delete_#{object}!" do |name, **query_parameters|
-              request!(:delete, "#{api}/namespaces/#{namespace}/#{object}s/#{name}", **query_parameters)
-            end
+          define_method :"replace_#{resource}!" do |name, spec, **query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:put, "#{api_path}/namespaces/#{namespace}/#{resource}s/#{name}", body: spec, **query_parameters)
+          end
 
-            define_method :"delete_#{object}s!" do |**query_parameters|
-              request!(:delete, "#{api}/namespaces/#{namespace}/#{object}s", **query_parameters)
-            end
+          define_method :"delete_#{resource}!" do |name, **query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:delete, "#{api_path}/namespaces/#{namespace}/#{resource}s/#{name}", **query_parameters)
+          end
 
-            define_method :"#{object}?" do |name, **query_parameters|
-              public_send(:"#{object}_list", **query_parameters)['items'].map { |item| item['metadata']['name'] }.include?(name)
-            end
+          define_method :"delete_#{resource}s!" do |**query_parameters|
+            api_path = resource_endpoint_path(resource)
+            request!(:delete, "#{api_path}/namespaces/#{namespace}/#{resource}s", **query_parameters)
+          end
+
+          define_method :"#{resource}?" do |name, **query_parameters|
+            public_send(:"#{resource}_list", **query_parameters)['items'].map { |item| item['metadata']['name'] }.include?(name)
           end
         end
 
+
         def namespace_list(**query_parameters)
           request!(:get, '/api/v1/namespaces', **query_parameters)
         end
@@ -99,6 +155,21 @@ module Dapp
           request!(:delete, "/api/v1/namespaces/#{name}", **query_parameters)
         end
 
+        # minikube returns empty major and minor. Fallback to stable only apis for minikube setup
+        def cluster_version(**query_parameters)
+          version_obj = request!(:get, "/version", **query_parameters)
+          @cluster_version ||= begin
+            major = version_obj['major']
+            minor = version_obj['minor']
+            k8s_version = "#{version_obj['major']}.#{version_obj['minor']}"
+            if K8S_API_ENDPOINTS.has_key?(k8s_version)
+              k8s_version
+            else
+              "stable"
+            end
+          end
+        end
+
         def pod_log(name, follow: false, **query_parameters, &blk)
           excon_parameters = follow ? { response_block: blk } : {}
           request!(:get,

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.27.24'
-  BUILD_CACHE_VERSION = 29.1
+  VERSION = "0.28.0"
+  BUILD_CACHE_VERSION = 28
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.27.24
+  version: 0.28.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -234,14 +234,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -467,10 +467,9 @@ files:
 - lib/dapp/cli.rb
 - lib/dapp/cli/cli.rb
 - lib/dapp/cli/command/base.rb
-- lib/dapp/cli/command/options/tag.rb
 - lib/dapp/cli/command/slug.rb
 - lib/dapp/cli/command/update.rb
-- lib/dapp/cli/options/ssh.rb
+- lib/dapp/cli/options/tag.rb
 - lib/dapp/config/config.rb
 - lib/dapp/config/directive/base.rb
 - lib/dapp/core_ext/hash.rb
@@ -600,6 +599,7 @@ files:
 - lib/dapp/dimg/cli/command/dimg/stages/pull.rb
 - lib/dapp/dimg/cli/command/dimg/stages/push.rb
 - lib/dapp/dimg/cli/command/dimg/tag.rb
+- lib/dapp/dimg/cli/options/introspection.rb
 - lib/dapp/dimg/config/config.rb
 - lib/dapp/dimg/config/directive/artifact.rb
 - lib/dapp/dimg/config/directive/artifact_base.rb

data/lib/dapp/cli/command/options/tag.rb

@@ -1,53 +0,0 @@
-module Dapp
-  class CLI
-    module Command
-      module Options
-        module Tag
-          def self.extended(klass)
-            klass.class_eval do
-              "Add tag (can be used one or more times), specified text will be slugified".tap do |desc|
-                option :tag,
-                        long: '--tag TAG',
-                        description: desc,
-                        default: [],
-                        proc: proc { |v| composite_options(:tags) << v }
-
-                option :tag_slug,
-                        long: '--tag-slug TAG',
-                        description: desc,
-                        default: [],
-                        proc: proc { |v| composite_options(:slug_tags) << v }
-              end
-
-              option :tag_plain,
-                     long: '--tag-plain TAG',
-                     description: "Add tag (can be used one or more times)",
-                     default: [],
-                     proc: proc { |v| composite_options(:plain_tags) << v }
-
-              option :tag_branch,
-                     long: '--tag-branch',
-                     description: 'Tag by git branch',
-                     boolean: true
-
-              option :tag_build_id,
-                     long: '--tag-build-id',
-                     description: 'Tag by CI build id',
-                     boolean: true
-
-              option :tag_ci,
-                     long: '--tag-ci',
-                     description: 'Tag by CI branch and tag',
-                     boolean: true
-
-              option :tag_commit,
-                     long: '--tag-commit',
-                     description: 'Tag by git commit',
-                     boolean: true
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dapp/cli/options/ssh.rb

@@ -1,18 +0,0 @@
-module Dapp
-  class CLI
-    module Options
-      module Ssh
-        def self.extended(klass)
-          klass.class_eval do
-            option :ssh_key,
-                  long: '--ssh-key SSH_KEY',
-                  description: ['Enable only specified ssh keys ',
-                                '(use system ssh-agent by default)'].join,
-                  default: nil,
-                  proc: ->(v) { composite_options(:ssh_key) << v }
-          end
-        end
-      end
-    end
-  end
-end