dapp 0.2.8 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFkZDc3NDY0ZWRiMTEyMjM5ZjM5MmJhY2RkNmNlZWE2ZWUyYzFkNQ==
+    NTM1NTkwNWNjMzM0YTkzYTdlOGMzODY4MzE4ZGQ5YWZmNjI0YmU5Zg==
   data.tar.gz: !binary |-
-    ZjI5NmE2ZTA0YTQwZjg1ZDc0MWI0MWE1ZDM2ZjcxMzAyNzAwNDhmZQ==
+    YjM5ODYyYzIzNDA3YjkyODFkYThjYjE2NTFhNDA4MGQxM2IyZGE2Mg==
 SHA512:
   metadata.gz: !binary |-
-    OGFiMDcwODlhYmVlZWMxMmM5YTI4OTAyOWIwNDViNjE5ODQxNzc4MzU4NDAz
-    MjUwZjIyY2VhYTM5MzQ3MGEzYjExMDFkMjYwNTA4ZDRmOGIxYzhlMzRiMTQw
-    NTgxYmI4NWU3MDM0NGNhZjVjOTdmZTJkNDU1YWMyZTE0ZDRlNzE=
+    OThjNmU0YmUyODZlODdkNzI2YjdiM2MyZDA4YmZkOWY2NTdmM2Y4MGJkYWM1
+    MTliMzkyMjcwMThiMGMzNTE2MGQyMGI0NGMyMTNlMDdkM2M5NDMzYjcxZTc0
+    YzM3YmMzZTkyNGYwZTM4YmJjMjY5YmFkN2U3YmVmMTgwODA5ZWY=
   data.tar.gz: !binary |-
-    NjQyYTQzMzA1ZDMzOTY2N2EwODRlMzQyZDU4MjBiNDA4ZWRkOGZlOGU2NGIx
-    MGM5ZTYzNjg2MjZiOWUzZDU0ZmI4NGNhNzJhZTAwOGE4MTZlN2VjODgyMzI3
-    ZWMwMTQ4MDQ1MTM0NWI4M2I3MDYzYmQ0MDI0NDM0YjlkNDE2ZGE=
+    OWRiZGIzNzY0MTQzYzk3OTJlMDYxNDA4ZjI2OWEwZGQzNDQ2NTQ3NjQ4MGUx
+    N2Y4NTVmY2UyNTNhMGUzNmUwMTI1Zjg3ODJjZDhlYmIwZDIyZDgxZTFiZmRm
+    YWUwNGU0ZmY1MzJlNmU2ZDNhYmRmYTg1ZWFmODU1ZTYxMWFjZDQ=

data/config/en/common.yml

@@ -5,10 +5,12 @@ en:
       info: "date: %{date}\nsize: %{size} MB"
       commands: "commands:"
     process:
+      artifact_copy: "copying artifact '%{name}'"
       git_artifact_loading: 'loading git_artifact'
+      git_artifact_clone: "cloning remote git_artifact '%{name}'"
+      git_artifact_fetch: "fetching remote git_artifact '%{name}'"
       chefdk_loading: 'loading chefdk'
       berks_vendor: 'berks_vendor'
-      git_artifact_fetch: "fetching remote git_artifact '%{name}'"
     status:
       process:
         pushing: '[PUSHING]'

data/config/en/net_status.yml

@@ -5,6 +5,7 @@ en:
       shell_command_failed: ">>> START STREAM\n%{stream}\n>>> END STREAM"
     application:
       application_not_built: "Application hasn't been built yet!"
+      application_not_run: "Application run failed!"
       git_branch_without_name: "Application has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
     build:
@@ -14,11 +15,13 @@ en:
       another_image_already_tagged: 'Image with other id already tagged!'
       built_id_not_defined: '`from.built_id` not defined!'
     controller:
-      push_command_unexpected_apps: "Push command can process only one application!"
+      push_command_unexpected_apps_number: "Push command can process only one application!"
+      run_command_unexpected_apps_number: "Run command can process only one application!"
       no_such_app: "No such app: '%{patterns}' in '%{path}'!"
       dappfile_not_found: "Dappfile not found!"
     config:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_not_defined: "Docker `from` not defined!"
-      git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't have attribute '%{attr}'!"
+      artifact_unexpected_attribute: "Artifact doesn't have attribute '%{attr}'!"
+      git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't have attribute '%{attr}'!"

data/lib/dapp.rb

@@ -32,13 +32,15 @@ require 'dapp/cli/push'
 require 'dapp/cli/smartpush'
 require 'dapp/cli/list'
 require 'dapp/cli/flush'
-require 'dapp/cli/flush/stage_cache'
-require 'dapp/cli/flush/build_cache'
+require 'dapp/cli/flush/stages'
+require 'dapp/cli/flush/metadata'
+require 'dapp/cli/run'
 require 'dapp/filelock'
 require 'dapp/config/application'
 require 'dapp/config/main'
 require 'dapp/config/chef'
 require 'dapp/config/shell'
+require 'dapp/config/artifact'
 require 'dapp/config/git_artifact'
 require 'dapp/config/docker'
 require 'dapp/builder/base'
@@ -66,20 +68,21 @@ require 'dapp/application/logging'
 require 'dapp/application/path'
 require 'dapp/application/tags'
 require 'dapp/application'
-require 'dapp/docker_image'
-require 'dapp/stage_image'
+require 'dapp/image/arguments'
+require 'dapp/image/docker'
+require 'dapp/image/stage'
 require 'dapp/git_repo/base'
 require 'dapp/git_repo/own'
 require 'dapp/git_repo/remote'
 require 'dapp/git_artifact'
-require 'dapp/exception/base'
-require 'dapp/exception/introspect_image'
 require 'dapp/error/base'
 require 'dapp/error/application'
 require 'dapp/error/build'
 require 'dapp/error/config'
 require 'dapp/error/controller'
 require 'dapp/error/shellout'
+require 'dapp/exception/base'
+require 'dapp/exception/introspect_image'
 
 # Dapp
 module Dapp

data/lib/dapp/application.rb

@@ -14,21 +14,28 @@ module Dapp
     attr_reader :config
     attr_reader :cli_options
     attr_reader :ignore_git_fetch
+    attr_reader :is_artifact
 
-    def initialize(config:, cli_options:, ignore_git_fetch: false)
+    def initialize(config:, cli_options:, ignore_git_fetch: false, is_artifact: false)
       @config = config
       @cli_options = cli_options
 
-      @build_path = cli_options[:build_dir] || home_path('build')
-      @build_cache_path = cli_options[:build_cache_dir] || home_path('build_cache')
+      @tmp_path = Dir.mktmpdir(cli_options[:tmp_dir_prefix] || 'dapp-')
+      @metadata_path = cli_options[:metadata_dir] || home_path('.dapps-metadata')
 
       @last_stage = Build::Stage::Source5.new(self)
       @ignore_git_fetch = ignore_git_fetch
+      @is_artifact = is_artifact
     end
 
     def build!
-      last_stage.build!
-      last_stage.save_in_cache!
+      log_step(config._name)
+      with_log_indent do
+        last_stage.build!
+        last_stage.save_in_cache!
+      end
+    ensure
+      FileUtils.rm_rf(tmp_path)
     end
 
     def export!(repo)
@@ -46,10 +53,28 @@ module Dapp
       end
     end
 
+    def run(docker_options, command)
+      raise Error::Application, code: :application_not_built unless last_stage.image.tagged?
+      cmd = "docker run #{[docker_options, last_stage.image.name, command].flatten.compact.join(' ')}"
+      if dry_run?
+        log_info(cmd)
+      else
+        system(cmd) || raise(Error::Application, code: :application_not_run)
+      end
+    end
+
+    def signature
+      last_stage.send(:signature)
+    end
+
     def builder
       @builder ||= Builder.const_get(config._builder.capitalize).new(self)
     end
 
+    def meta_options
+      { cli_options: cli_options, ignore_git_fetch: ignore_git_fetch }
+    end
+
     protected
 
     attr_reader :last_stage

data/lib/dapp/application/logging.rb

@@ -58,8 +58,8 @@ module Dapp
         end
       end
 
-      def log_secondary_process(message, **kvargs, &blk)
-        log_process(message, **kvargs.merge(style: { message: :secondary, success: :secondary }), &blk)
+      def log_secondary_process(message, **kwargs, &blk)
+        log_process(message, **kwargs.merge(style: { message: :secondary, success: :secondary }), &blk)
       end
 
       def log_process_verbose(message, process:, style: {}, &blk)

data/lib/dapp/application/path.rb

@@ -7,16 +7,20 @@ module Dapp
         make_path(config._home_path, *path).expand_path
       end
 
-      def build_path(*path)
-        make_path(@build_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
+      def tmp_path(*path)
+        make_path(@tmp_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
       end
 
-      def build_cache_path(*path)
-        make_path(@build_cache_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
+      def metadata_path(*path)
+        make_path(@metadata_path, home_path.basename, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
       end
 
-      def container_build_path(*path)
-        make_path('/.build', *path)
+      def container_dapp_path(*path)
+        make_path('/.dapp', *path)
+      end
+
+      def container_tmp_path(*path)
+        container_dapp_path('tmp', *path)
       end
 
       private

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

@@ -46,14 +46,16 @@ module Dapp
         end
 
         def signature
-          hashsum prev_stage.signature
+          hashsum [prev_stage.signature, artifacts_signatures]
         end
 
         def image
           @image ||= begin
-            StageImage.new(name: image_name, from: from_image).tap do |image|
-              image.add_volume "#{application.build_path}:#{application.container_build_path}"
+            Image::Stage.new(name: image_name, from: from_image).tap do |image|
+              image.add_volume "#{application.tmp_path}:#{application.container_tmp_path}"
+              before_artifacts.each { |artifact| apply_artifact(artifact, image) }
               yield image if block_given?
+              after_artifacts.each { |artifact| apply_artifact(artifact, image) }
             end
           end
         end
@@ -73,7 +75,7 @@ module Dapp
         end
 
         def should_be_introspected?
-          application.cli_options[:introspect_stage] == name && !application.dry_run?
+          application.cli_options[:introspect_stage] == name && !application.dry_run? && !application.is_artifact
         end
 
         def image_build!
@@ -94,14 +96,14 @@ module Dapp
         end
 
         def image_info
-          date, bytesize = image.info
-          _date, from_bytesize = from_image.info
-          [date, (from_bytesize.to_i - bytesize.to_i).abs]
+          date, size = image.info
+          _date, from_size = from_image.info
+          [date, (from_size.to_f - size.to_f).abs]
         end
 
         def format_image_info
-          date, bytesize = image_info
-          application.t(code: 'image.info', data: { date: Time.parse(date).localtime, size: to_mb(bytesize.to_i) })
+          date, size = image_info
+          application.t(code: 'image.info', data: { date: Time.parse(date).localtime, size: size.to_f.round(2) })
         end
 
         # rubocop:disable Metrics/AbcSize
@@ -115,6 +117,72 @@ module Dapp
             end
           end if application.log? && application.log_verbose?
         end
+        # rubocop:enable Metrics/AbcSize
+
+        def before_artifacts
+          @before_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._before == name })
+        end
+
+        def after_artifacts
+          @after_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._after == name })
+        end
+
+        def do_artifacts(artifacts)
+          artifacts.map do |artifact|
+            {
+              name: artifact._config._name,
+              options: artifact._artifact_options,
+              app: Application.new(config: artifact._config, is_artifact: true, **application.meta_options).tap(&:build!)
+            }
+          end
+        end
+
+        def artifacts_signatures
+          (before_artifacts + after_artifacts).map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
+        end
+
+        def apply_artifact(artifact, image)
+          return if application.dry_run?
+
+          artifact_name = artifact[:name]
+          app = artifact[:app]
+          cwd = artifact[:options][:cwd]
+          paths = artifact[:options][:paths]
+          owner = artifact[:options][:owner]
+          group = artifact[:options][:group]
+          where_to_add = artifact[:options][:where_to_add]
+
+          docker_options = ['--rm',
+                            "--volume #{application.tmp_path('artifact', artifact_name)}:#{app.container_tmp_path(artifact_name)}",
+                            '--entrypoint /bin/sh']
+          commands = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid)
+          application.log_secondary_process(application.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
+            app.run(docker_options, Array(application.shellout_pack(commands)))
+          end
+
+          commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)
+          image.add_commands commands
+        end
+
+        # rubocop:disable Metrics/ParameterLists
+        def safe_cp(from, to, owner, group, cwd = '', paths = [])
+          credentials = ''
+          credentials += "-o #{owner} " if owner
+          credentials += "-g #{group} " if group
+
+          commands = []
+          commands << ['install', credentials, '-d', to].join(' ')
+
+          copy_files = lambda do |from_, cwd_, path_ = ''|
+            "find #{File.join(from_, cwd_, path_)} -type f -exec bash -ec 'install -D #{credentials} {} " \
+            "#{File.join(to, "$(echo {} | sed -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
+          end
+
+          commands.concat(paths.empty? ? Array(copy_files.call(from, cwd)) : paths.map { |path| copy_files.call(from, cwd, path) })
+          commands << "find #{to} -type d -exec bash -ec 'install -d #{credentials} {}' \\;"
+          commands.join(' && ')
+        end
+        # rubocop:enable Metrics/ParameterLists
       end # Base
     end # Stage
   end # Build

data/lib/dapp/build/stage/chef_cookbooks.rb

@@ -9,7 +9,7 @@ module Dapp
         end
 
         def signature
-          hashsum [prev_stage.signature, *application.builder.chef_cookbooks_checksum]
+          hashsum [super, *application.builder.chef_cookbooks_checksum]
         end
 
         def image

data/lib/dapp/build/stage/from.rb

@@ -5,6 +5,7 @@ module Dapp
       class From < Base
         def signature
           hashsum [from_image_name,
+                   artifacts_signatures,
                    application.config._docker._from_cache_version,
                    Dapp::BUILD_CACHE_VERSION]
         end
@@ -28,7 +29,7 @@ module Dapp
         end
 
         def from_image
-          @from_image ||= StageImage.new(name: from_image_name)
+          @from_image ||= Image::Stage.new(name: from_image_name)
         end
 
         def image_info

data/lib/dapp/build/stage/infra_install.rb

@@ -9,7 +9,7 @@ module Dapp
         end
 
         def signature
-          hashsum [prev_stage.signature, *application.builder.infra_install_checksum]
+          hashsum [super, *application.builder.infra_install_checksum]
         end
 
         def image

data/lib/dapp/build/stage/source_1.rb

@@ -15,7 +15,7 @@ module Dapp
         protected
 
         def dependencies_checksum
-          hashsum [prev_stage.signature,
+          hashsum [super,
                    app_install_files_checksum,
                    *application.builder.app_install_checksum]
         end

data/lib/dapp/build/stage/source_1_archive.rb

@@ -16,10 +16,6 @@ module Dapp
           next_stage
         end
 
-        def container_archive_path(git_artifact)
-          application.container_build_path git_artifact.filename '.tar.gz'
-        end
-
         protected
 
         def apply_command_method

data/lib/dapp/build/stage/source_2.rb

@@ -11,7 +11,7 @@ module Dapp
         protected
 
         def dependencies_checksum
-          hashsum [prev_stage.signature,
+          hashsum [super,
                    *application.builder.infra_setup_checksum]
         end
       end # Source2

data/lib/dapp/build/stage/source_3.rb

@@ -11,7 +11,7 @@ module Dapp
         protected
 
         def dependencies_checksum
-          hashsum [prev_stage.signature,
+          hashsum [super,
                    app_setup_files_checksum,
                    *application.builder.app_setup_checksum]
         end

data/lib/dapp/build/stage/source_base.rb

@@ -29,7 +29,7 @@ module Dapp
             bash_commands = []
             volumes = []
             application.git_artifacts.each do |git_artifact|
-              volumes << "#{git_artifact.repo.dir_path}:#{git_artifact.repo.container_build_dir_path}"
+              volumes << "#{git_artifact.repo.path}:#{git_artifact.repo.container_path}"
               bash_commands.concat(git_artifact.send(apply_command_method, self))
             end
 
@@ -43,7 +43,7 @@ module Dapp
         end
 
         def dependencies_checksum
-          hashsum [prev_stage.signature]
+          hashsum [prev_stage.signature, artifacts_signatures]
         end
 
         def layer_commit(git_artifact)
@@ -94,7 +94,7 @@ module Dapp
         end
 
         def layer_commit_file_path(git_artifact)
-          application.build_path git_artifact.filename ".#{name}.#{git_artifact.paramshash}.#{dependencies_checksum}.commit"
+          application.metadata_path git_artifact.filename ".#{name}.#{git_artifact.paramshash}.#{dependencies_checksum}.commit"
         end
 
         def dependency_files_checksum(regs)

data/lib/dapp/builder/chef.rb

@@ -2,34 +2,23 @@ module Dapp
   module Builder
     # Chef
     class Chef < Base
-      LOCAL_COOKBOOK_PATTERNS = %w(
+      LOCAL_COOKBOOK_CHECKSUM_PATTERNS = %w(
         recipes/**/*
         files/**/*
         templates/**/*
       ).freeze
 
-      STAGE_LOCAL_COOKBOOK_PATTERNS = %w(
-        metadata.json
-        recipes/%{stage}.rb
-        recipes/*_%{stage}.rb
-        files/default/%{stage}/*
-        templates/default/%{stage}/*
-      ).freeze
-
       DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.17.3-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
 
       [:infra_install, :infra_setup, :app_install, :app_setup].each do |stage|
         define_method(:"#{stage}_checksum") { stage_cookbooks_checksum(stage) }
 
         define_method(:"#{stage}") do |image|
-          install_stage_cookbooks(stage)
-          install_chef_solo_stage_config(stage)
-
           unless stage_empty?(stage)
             image.add_volumes_from(chefdk_container)
             image.add_commands 'export PATH=/.dapp/deps/chefdk/bin:$PATH'
 
-            image.add_volume "#{stage_build_path(stage)}:#{container_stage_build_path(stage)}"
+            image.add_volume "#{stage_tmp_path(stage)}:#{container_stage_tmp_path(stage)}"
             image.add_commands ['chef-solo',
                                 "-c #{container_stage_config_path(stage)}",
                                 "-o #{stage_cookbooks_runlist(stage).join(',')}"].join(' ')
@@ -42,9 +31,11 @@ module Dapp
       end
 
       def chef_cookbooks(image)
+        image.add_volume "#{cookbooks_vendor_path}:#{application.container_dapp_path('chef_vendored_cookbooks')}"
         image.add_commands(
-          "mkdir -p /usr/share/dapp/chef_repo",
-          "cp -a #{container_cookbooks_vendor_path} /usr/share/dapp/chef_repo/cookbooks"
+          'mkdir -p /usr/share/dapp/chef_repo',
+          ["cp -a #{application.container_dapp_path('chef_vendored_cookbooks')} ",
+           '/usr/share/dapp/chef_repo/cookbooks'].join
         )
       end
 
@@ -74,76 +65,40 @@ module Dapp
         @cookbook_metadata ||= CookbookMetadata.new(cookbook_metadata_path)
       end
 
+
       def berksfile_lock_checksum
         application.hashsum berksfile_lock_path.read if berksfile_lock_path.exist?
       end
 
-      # rubocop:disable Metrics/AbcSize
-      def stage_cookbooks_runlist(stage)
-        @stage_cookbooks_runlist ||= {}
-        @stage_cookbooks_runlist[stage] ||= [].tap do |res|
-          to_runlist_entrypoint = proc do |name, entrypoint|
-            entrypoint_file = stage_cookbooks_path(stage, name, 'recipes', "#{entrypoint}.rb")
-            next unless entrypoint_file.exist?
-            "#{name}::#{entrypoint}"
-          end
-
-          res.concat(application.config._chef._modules.map do |name|
-            to_runlist_entrypoint[name, stage]
-          end.compact)
-
-          project_main_entry = to_runlist_entrypoint[project_name, stage]
-          res << project_main_entry if project_main_entry
-
-          res.concat(application.config._app_runlist.map do |app_component|
-            to_runlist_entrypoint[project_name, [app_component, stage].join('_')]
-          end.compact)
-        end
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      def local_cookbook_paths
-        @local_cookbook_paths ||= berksfile.local_cookbooks
-                                           .values
-                                           .map { |cookbook| cookbook[:path] }
-                                           .product(LOCAL_COOKBOOK_PATTERNS)
-                                           .map { |cb, dir| Dir[cb.join(dir)] }
-                                           .flatten
-                                           .map(&Pathname.method(:new))
-      end
-
-      def stage_cookbooks_vendored_paths(stage, with_files: false)
-        Dir[cookbooks_vendor_path('*')]
-          .map do |cookbook_path|
-            if ['mdapp-*', project_name].any? { |pattern| File.fnmatch(pattern, File.basename(cookbook_path)) }
-              STAGE_LOCAL_COOKBOOK_PATTERNS.map do |pattern|
-                Dir[File.join(cookbook_path, pattern % { stage: stage })]
-              end
-            elsif with_files
-              Dir[File.join(cookbook_path, '**/*')]
-            else
-              cookbook_path
-            end
-          end
+      def local_cookbook_paths_for_checksum
+        @local_cookbook_paths_for_checksum ||= berksfile
+          .local_cookbooks
+          .values
+          .map { |cookbook| cookbook[:path] }
+          .product(LOCAL_COOKBOOK_CHECKSUM_PATTERNS)
+          .map { |cb, dir| Dir[cb.join(dir)] }
           .flatten
           .map(&Pathname.method(:new))
       end
 
+      def stage_cookbooks_paths_for_checksum(stage)
+        install_stage_cookbooks(stage)
+        Dir[stage_cookbooks_path(stage, '**/*')].map(&Pathname.method(:new))
+      end
+
       def stage_cookbooks_checksum_path(stage)
-        application.build_cache_path("#{cookbooks_checksum}.#{stage}.checksum")
+        application.metadata_path("#{cookbooks_checksum}.#{stage}.checksum")
       end
 
       def stage_cookbooks_checksum(stage)
         if stage_cookbooks_checksum_path(stage).exist?
           stage_cookbooks_checksum_path(stage).read.strip
         else
-          install_cookbooks
-
-          if stage == :chef_cookbooks
-            checksum = cookbooks_checksum
+          checksum = if stage == :chef_cookbooks
+            cookbooks_checksum
           else
-            checksum = application.hashsum [
-              _paths_checksum(stage_cookbooks_vendored_paths(stage, with_files: true)),
+            application.hashsum [
+              _paths_checksum(stage_cookbooks_paths_for_checksum(stage)),
               *application.config._chef._modules,
               stage == :infra_install ? chefdk_image : nil
             ].compact
@@ -157,11 +112,12 @@ module Dapp
       def cookbooks_checksum
         @cookbooks_checksum ||= application.hashsum [
           berksfile_lock_checksum,
-          _paths_checksum(local_cookbook_paths),
+          _paths_checksum(local_cookbook_paths_for_checksum),
           *application.config._chef._modules
         ]
       end
 
+
       def chefdk_image
         DEFAULT_CHEFDK_IMAGE # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
       end
@@ -187,101 +143,165 @@ module Dapp
         end
       end
 
+
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_cookbooks
-        @install_cookbooks ||= begin
-          volumes_from = chefdk_container
-          application.log_secondary_process(application.t(code: 'process.berks_vendor')) do
-            ssh_auth_socket_path = nil
-            ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
-
-            vendor_commands = [
-              'mkdir -p ~/.ssh',
-              'echo "Host *" >> ~/.ssh/config',
-              'echo "    StrictHostKeyChecking no" >> ~/.ssh/config',
-              'if [ ! -f Berksfile.lock ] ; then echo "Berksfile.lock not found" 1>&2 ; exit 1 ; fi',
-              'cp -a Berksfile.lock /tmp/Berksfile.lock.orig',
-              '/.dapp/deps/chefdk/bin/berks vendor /tmp/vendored_cookbooks',
-              'export LOCKDIFF=$(diff -u0 Berksfile.lock /tmp/Berksfile.lock.orig)',
-              ['if [ "$LOCKDIFF" != "" ] ; then ',
-               'cp -a /tmp/Berksfile.lock.orig Berksfile.lock ; ',
-               'echo -e "Bad Berksfile.lock\n$LOCKDIFF" 1>&2 ; exit 1 ; fi'].join,
-              ["find /tmp/vendored_cookbooks -type f -exec bash -ec '",
-               "install -D -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) {} ",
-               "#{cookbooks_vendor_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks\\///g\")' \\;"].join,
-              "chown -R #{Process.uid}:#{Process.gid} #{berksfile_lock_path}",
-            ]
-
-            application.shellout!(
-              ['docker run --rm',
-               ("--volume #{ssh_auth_socket_path}:#{ssh_auth_socket_path}" if ssh_auth_socket_path),
-               "--volume #{cookbooks_vendor_path.tap(&:mkpath)}:#{cookbooks_vendor_path}",
-               *berksfile.local_cookbooks
-                         .values
-                         .map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
-               "--volumes-from #{volumes_from}",
-               "--workdir #{berksfile_path.parent}",
-               ("--env SSH_AUTH_SOCK=#{ssh_auth_socket_path}" if ssh_auth_socket_path),
-               "dappdeps/berksdeps:0.1.0 #{application.shellout_pack(vendor_commands.join(' && '))}"].compact.join(' '),
-              log_verbose: application.log_verbose?
-            )
-
-            true
-          end
+        volumes_from = chefdk_container
+        application.log_secondary_process(application.t(code: 'process.berks_vendor')) do
+          ssh_auth_socket_path = nil
+          ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
+
+          vendor_commands = [
+            'mkdir -p ~/.ssh',
+            'echo "Host *" >> ~/.ssh/config',
+            'echo "    StrictHostKeyChecking no" >> ~/.ssh/config',
+            'if [ ! -f Berksfile.lock ] ; then echo "Berksfile.lock not found" 1>&2 ; exit 1 ; fi',
+            'cp -a Berksfile.lock /tmp/Berksfile.lock.orig',
+            '/.dapp/deps/chefdk/bin/berks vendor /tmp/vendored_cookbooks',
+            'export LOCKDIFF=$(diff -u0 Berksfile.lock /tmp/Berksfile.lock.orig)',
+            ['if [ "$LOCKDIFF" != "" ] ; then ',
+             'cp -a /tmp/Berksfile.lock.orig Berksfile.lock ; ',
+             'echo -e "Bad Berksfile.lock\n$LOCKDIFF" 1>&2 ; exit 1 ; fi'].join,
+            ["find /tmp/vendored_cookbooks -type f -exec bash -ec '",
+             "install -D -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) {} ",
+             "#{_cookbooks_vendor_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks\\///g\")' \\;"].join
+          ]
+
+          application.shellout!(
+            ['docker run --rm',
+             ("--volume #{ssh_auth_socket_path}:#{ssh_auth_socket_path}" if ssh_auth_socket_path),
+             "--volume #{_cookbooks_vendor_path.tap(&:mkpath)}:#{_cookbooks_vendor_path}",
+             *berksfile.local_cookbooks
+                       .values
+                       .map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
+             "--volumes-from #{volumes_from}",
+             "--workdir #{berksfile_path.parent}",
+             ("--env SSH_AUTH_SOCK=#{ssh_auth_socket_path}" if ssh_auth_socket_path),
+             "dappdeps/berksdeps:0.1.0 bash #{application.shellout_pack(vendor_commands.join(' && '))}"].compact.join(' '),
+            log_verbose: application.log_verbose?
+          )
+
+          true
         end
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      def install_stage_cookbooks(stage)
-        stage_cookbooks_path(stage).mkpath
-        stage_cookbooks_vendored_paths(stage).each do |path|
-          new_path = stage_cookbooks_path(stage, path.relative_path_from(cookbooks_vendor_path))
-          new_path.parent.mkpath
-          FileUtils.cp_r path, new_path
-        end
+      def _cookbooks_vendor_path
+        application.metadata_path("cookbooks.#{cookbooks_checksum}")
       end
 
-      def stage_empty?(stage)
-        stage_cookbooks_runlist(stage).empty?
+      def cookbooks_vendor_path(*path)
+        _cookbooks_vendor_path.tap do |cookbooks_path|
+          install_cookbooks unless cookbooks_path.exist?
+        end.join(*path)
       end
 
-      def install_chef_solo_stage_config(stage)
-        stage_config_path(stage).write [
-          "file_cache_path \"/var/cache/dapp/chef\"\n",
-          "cookbook_path \"#{container_stage_cookbooks_path(stage)}\"\n"
-        ].join
-      end
 
-      def cookbooks_vendor_path(*path)
-        application.build_path('chef', 'vendored_cookbooks').join(*path)
-      end
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def install_stage_cookbooks(stage)
+        @install_stage_cookbooks ||= {}
+        @install_stage_cookbooks[stage] ||= true.tap do
+          common_paths = proc do |cookbook_path|
+            [['metadata.json', 'metadata.json'],
+             ["files/#{stage}", 'files/default'],
+             ["templates/#{stage}", 'templates/default']
+            ].select { |from, _| cookbook_path.join(from).exist? }
+          end
 
-      def container_cookbooks_vendor_path(*path)
-        application.container_build_path('chef', 'vendored_cookbooks').join(*path)
+          install_paths = Dir[cookbooks_vendor_path('*')]
+            .map(&Pathname.method(:new))
+            .map { |cookbook_path|
+              cookbook_name = File.basename cookbook_path
+              is_project = (cookbook_name == project_name)
+              is_mdapp = cookbook_name.start_with? 'mdapp-'
+              mdapp_enabled = is_mdapp && application.config._chef._modules.include?(cookbook_name)
+
+              paths = if is_project
+                recipe_paths = application.config._chef._recipes
+                  .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
+                  .select { |from, _| cookbook_path.join(from).exist? }
+
+                (recipe_paths + common_paths[cookbook_path]) if recipe_paths.any?
+              elsif is_mdapp and mdapp_enabled
+                recipe_path = "recipes/#{stage}.rb"
+                if cookbook_path.join(recipe_path).exist?
+                  [[recipe_path, recipe_path]] + common_paths[cookbook_path]
+                end
+              else
+                [['.', '.']]
+              end
+
+              [cookbook_path, paths] if paths and paths.any?
+            }
+            .compact
+
+          stage_cookbooks_path(stage).mkpath
+          install_paths.each do |cookbook_path, paths|
+            paths.each do |from, to|
+              from_path = cookbook_path.join(from)
+              to_path = stage_cookbooks_path(stage, cookbook_path.basename, to)
+              to_path.parent.mkpath
+              FileUtils.cp_r from_path, to_path
+            end
+          end
+        end
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      # rubocop:disable Metrics/AbcSize
+      def stage_cookbooks_runlist(stage)
+        install_stage_cookbooks(stage)
+
+        @stage_cookbooks_runlist ||= {}
+        @stage_cookbooks_runlist[stage] ||= [].tap do |res|
+          to_runlist_entrypoint = proc do |cookbook, entrypoint|
+            entrypoint_file = stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb")
+            next unless entrypoint_file.exist?
+            "#{cookbook}::#{entrypoint}"
+          end
+
+          res.concat(application.config._chef._recipes.map do |recipe|
+            to_runlist_entrypoint[project_name, recipe]
+          end.flatten.compact)
 
-      def stage_build_path(stage, *path)
-        application.build_path(application.config._name, stage).join(*path)
+          res.concat(application.config._chef._modules.map do |mod|
+            to_runlist_entrypoint[mod, stage]
+          end.flatten.compact)
+        end
       end
+      # rubocop:enable Metrics/AbcSize
 
-      def container_stage_build_path(_stage, *path)
-        path.compact.map(&:to_s).inject(Pathname.new('/chef_build'), &:+)
+      def stage_empty?(stage)
+        stage_cookbooks_runlist(stage).empty?
       end
 
       def stage_cookbooks_path(stage, *path)
-        stage_build_path(stage, 'cookbooks', *path)
+        stage_tmp_path(stage, 'cookbooks', *path)
       end
 
-      def container_stage_cookbooks_path(stage, *path)
-        container_stage_build_path(stage, 'cookbooks', *path)
-      end
 
-      def stage_config_path(stage, *path)
-        stage_build_path(stage, 'config.rb', *path)
+      def install_chef_solo_stage_config(stage)
+        @install_chef_solo_stage_config ||= {}
+        @install_chef_solo_stage_config[stage] ||= true.tap do
+          stage_tmp_path(stage, 'config.rb').write [
+            "file_cache_path \"/var/cache/dapp/chef\"\n",
+            "cookbook_path \"#{container_stage_tmp_path(stage, 'cookbooks')}\"\n"
+          ].join
+        end
       end
 
       def container_stage_config_path(stage, *path)
-        container_stage_build_path(stage, 'config.rb', *path)
+        install_chef_solo_stage_config(stage)
+        container_stage_tmp_path(stage, 'config.rb', *path)
+      end
+
+
+      def stage_tmp_path(stage, *path)
+        application.tmp_path(application.config._name, stage).join(*path)
+      end
+
+      def container_stage_tmp_path(_stage, *path)
+        path.compact.map(&:to_s).inject(Pathname.new('/chef_build'), &:+)
       end
 
       def _paths_checksum(paths)