dapp 0.6.17 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e78ed224c52a413cdceeaacf7877326f47dc1dd
-  data.tar.gz: ec07c5e997ed182b9ccfcf1c8097823ef3294d2e
+  metadata.gz: 5421a51c8a7e4aa97dd4366da97409289c335b88
+  data.tar.gz: 29d5b0434a33f376ce6809a5c32bfada6ab19528
 SHA512:
-  metadata.gz: 7e3e56663b2ee9c215a284a7e59ba2ce71bf1a888c695002f123862d2c8e59676dc5a91ac74fe81082bc1ac4d14498eaab9e7d3e264501912e7f144535a0e0ed
-  data.tar.gz: b105a61fec8f6b30bb9d9d65ed8621bfaba027e299136fd2f739a1f650453c6af6bca4656d63adc64811ccd65a5c3c7205f578da0dbfdc6a56fa17b7c7481e32
+  metadata.gz: 557da43530e8da7dd3051ce4e47de1e20bb3b4bb9d68b7c16e3dca37beebb334fe2be645b07e06a15113f79fc2d58ccb6e7e49383f46f7ffd18636a7d586d3b7
+  data.tar.gz: 9db7eea346c214b0990d7c823d7c95fcb179fc948e623ae17d3f09cc5f759f0fdb88cfd401e6bc4f70738f6acf4266f5620bafdb0cd112f24f21034617b5abf3

data/config/en/common.yml

@@ -28,7 +28,6 @@ en:
         pulling: '[PULLING]'
         building: '[BUILDING]'
         default: '[RUNNING]'
-        tagging: '[TAGGING]'
       success:
         default: '[OK]'
       failed:
@@ -41,8 +40,9 @@ en:
       empty: '[EMPTY]'
       push: '[PUSH]'
       pull: '[PULL]'
-      tag: '[TAG]'
     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!"
       excess_builder_instruction: "WARNING: Excessive use of the 'builder' instruction. Builder type will be automatically determined by the first use of any builder."
       excess_name_instruction: "WARNING: Excessive use of the 'name' instruction. Given name corresponds to default name."
       another_image_already_tagged: 'WARNING: image with other id already exist.'

data/config/en/net_status.yml

@@ -3,10 +3,10 @@ en:
     missing_translation: "Missing translation for code: '%{code}'!"
     shellout:
       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!"
+    dimg:
+      dimg_not_built: "Dimg hasn't been built yet!"
+      dimg_not_run: "Dimg run failed!"
+      git_branch_without_name: "Dimg has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
       chef_stage_checksum_not_calculated: "Chef stage '%{stage}' checksum is not calculated yet, run build first"
     dappfile:
@@ -18,38 +18,40 @@ en:
       built_id_not_defined: '`from.built_id` not defined!'
       from_image_not_found: 'Image `%{name}` not found!'
     project:
-      spush_command_unexpected_apps_number: "Command 'spush' can process only one application!"
-      tag_command_unexpected_apps_number: "Command 'tag' can process only one application!"
-      tag_command_incorrect_tag: "Incorrect tag ('%{name}') given!"
-      repo_name_incorrect: "Incorrect repo ('%{name}') given!"
-      command_unexpected_apps_number: "Command can process only one application!"
-      no_such_app: "No such app: '%{apps_patterns}'!"
+      spush_command_unexpected_dimgs_number: "Command 'spush' can process only one dimg!"
+      command_unexpected_dimgs_number: "Command can process only one dimg!"
+      no_such_dimg: "No such dimg: '%{dimgs_patterns}'!"
       dappfile_not_found: "Dappfile not found!"
       cannot_run_ssh_agent: "Cannot run ssh-agent"
       ssh_key_not_found: "Ssh key '%{path}' not exist!"
-      mrproper_required_option: "Expected command option '--improper-dev-mode-cache', '--improper-cache-version-stages' or '--all'!"
+      mrproper_required_option: "Expected command option '--all' or '--improper-cache-version-stages'!"
     config:
+      dimg_name_required: 'Dimg name required!'
+      dimg_name_incorrect: "Dimg has incorrect name '%{name}': doesn't match regex '%{reg}'!"
+      export_to_required: "Export: 'to' directive required!"
+      export_cwd_absolute_path_required: "Export: given cwd path must be absolute!"
+      export_to_absolute_path_required: "Export: given 'to' path must be absolute!"
+      export_include_paths_relative_path_required: "Export: given 'include_paths' path must be relative!"
+      export_exclude_paths_relative_path_required: "Export: given 'exclude_paths' path must be relative!"
+      mount_from_absolute_path_required: "Mount: given 'from' path must be absolute!"
+      mount_from_type_required: "Mount: 'from' directive expect 'build_dir' or 'tmp_dir' type!"
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
-      artifact_unexpected_attribute: "Artifact doesn't has attribute '%{attr}'!"
+      docker_from_incorrect: "`docker.from` has incorrect value `%{name}`: expected format `image_name:tag`!"
+      stage_artifact_not_associated: "Artifact not associated with any stage: expected 'before' or 'after' attribute!"
+      stage_artifact_double_associate: "Artifact cannot use with both associated attributes 'before' and 'after'!"
+      stage_artifact_not_supported_associated_stage: "Artifact not supported associated stage '%{stage}'!"
       artifact_conflict: "Conflict between artifacts paths!"
-      scratch_unsupported_directive: "Scratch application has unsupported directive '%{directive}'!"
-      scratch_artifact_required: "Scratch application without artifacts!"
-      scratch_artifact_associated: "Scratch artifact cannot be associated: not expected 'before'/'after' option!"
+      scratch_unsupported_directive: "Scratch dimg has unsupported directive '%{directive}'!"
+      scratch_artifact_required: "Scratch dimg without artifacts!"
+      scratch_artifact_associated: "Scratch artifact cannot be associated: not expected 'before'/'after' attribute!"
       scratch_artifact_docker_from: "Scratch artifact must have directive 'docker.from'!"
-      stage_artifact_not_associated: "Artifact not associated with any stage: expected 'before' or 'after' option!"
-      stage_artifact_double_associate: "Artifact cannot use with both associated options 'before' and 'after'!"
-      stage_artifact_not_supported_associated_stage: "Artifact not supported associated stage '%{stage}'!"
-      git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"
-      docker_from_incorrect: "`docker.from` has incorrect value `%{name}`: expected format `image_name:tag`!"
-      docker_from_without_tag: "`docker.from` has incorrect value `%{name}`: expected format `image_name:tag`!"
-      app_name_incorrect: "Application has incorrect name '%{name}': doesn't match regex '%{reg}'!"
     chef:
       stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"
       mdapp_dependency_in_metadata_forbidden: "Using mdapp as dependency in metadata.rb forbidden: detected '%{dependency}'"
     registry:
       incorrect_repo: 'Incorrect repository!'
-      no_such_app: 'No such app in registry!'
+      no_such_dimg: 'No such dimg in registry!'
       authenticate_type_not_supported: 'Registry authenticate type not supported!'
       page_not_found: "Page '%{url}' not found!"
       user_not_authorized: 'User not authorized!'

data/lib/dapp.rb

@@ -24,7 +24,7 @@ require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
 require 'dapp/prctl'
 require 'dapp/error/base'
-require 'dapp/error/application'
+require 'dapp/error/dimg'
 require 'dapp/error/dappfile'
 require 'dapp/error/build'
 require 'dapp/error/config'
@@ -42,7 +42,6 @@ require 'dapp/cli/base'
 require 'dapp/cli/build'
 require 'dapp/cli/push'
 require 'dapp/cli/spush'
-require 'dapp/cli/tag'
 require 'dapp/cli/list'
 require 'dapp/cli/stages'
 require 'dapp/cli/stages/flush_local'
@@ -57,24 +56,34 @@ require 'dapp/cli/bp'
 require 'dapp/cli/mrproper'
 require 'dapp/cli/stage_image'
 require 'dapp/filelock'
+require 'dapp/config/base'
+require 'dapp/config/dimg/instance_methods'
+require 'dapp/config/dimg/validation'
+require 'dapp/config/dimg'
+require 'dapp/config/artifact_dimg'
+require 'dapp/config/dimg_group_base'
+require 'dapp/config/dimg_group_main'
+require 'dapp/config/dimg_group'
+require 'dapp/config/artifact_group'
+require 'dapp/config/directive/base'
+require 'dapp/config/directive/artifact_base'
+require 'dapp/config/directive/git_artifact_local'
+require 'dapp/config/directive/git_artifact_remote'
 require 'dapp/config/directive/artifact'
 require 'dapp/config/directive/chef'
-require 'dapp/config/directive/git_artifact'
-require 'dapp/config/directive/tmp_dir'
-require 'dapp/config/directive/build_dir'
+require 'dapp/config/directive/shell/dimg'
+require 'dapp/config/directive/shell/artifact'
 require 'dapp/config/directive/docker/base'
+require 'dapp/config/directive/docker/dimg'
 require 'dapp/config/directive/docker/artifact'
-require 'dapp/config/directive/shell/base'
-require 'dapp/config/directive/shell/artifact'
-require 'dapp/config/application'
-require 'dapp/config/main'
-require 'dapp/config/artifact'
+require 'dapp/config/directive/mount'
 require 'dapp/builder/base'
 require 'dapp/builder/chef'
 require 'dapp/builder/chef/error'
 require 'dapp/builder/chef/cookbook_metadata'
 require 'dapp/builder/chef/berksfile'
 require 'dapp/builder/shell'
+require 'dapp/builder/none'
 require 'dapp/build/stage/mod/logging'
 require 'dapp/build/stage/mod/group'
 require 'dapp/build/stage/base'
@@ -120,7 +129,6 @@ require 'dapp/project/command/list'
 require 'dapp/project/command/push'
 require 'dapp/project/command/run'
 require 'dapp/project/command/spush'
-require 'dapp/project/command/tag'
 require 'dapp/project/command/stages/common'
 require 'dapp/project/command/stages/cleanup_local'
 require 'dapp/project/command/stages/cleanup_repo'
@@ -143,11 +151,11 @@ require 'dapp/docker_registry/mod/request'
 require 'dapp/docker_registry/mod/authorization'
 require 'dapp/docker_registry/base'
 require 'dapp/docker_registry/default'
-require 'dapp/application/git_artifact'
-require 'dapp/application/path'
-require 'dapp/application/tags'
-require 'dapp/application/stages'
-require 'dapp/application'
+require 'dapp/dimg/git_artifact'
+require 'dapp/dimg/path'
+require 'dapp/dimg/tags'
+require 'dapp/dimg/stages'
+require 'dapp/dimg'
 require 'dapp/artifact'
 require 'dapp/image/argument'
 require 'dapp/image/docker'

data/lib/dapp/artifact.rb

@@ -1,6 +1,6 @@
 module Dapp
   # Artifact
-  class Artifact < Application
+  class Artifact < Dimg
     def artifact?
       true
     end

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

@@ -3,8 +3,8 @@ module Dapp
     module Stage
       # AfterInstallArtifact
       class AfterInstallArtifact < ArtifactDefault
-        def initialize(application, next_stage)
-          @prev_stage = InstallGroup::GAPostInstallPatch.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = InstallGroup::GAPostInstallPatch.new(dimg, self)
           super
         end
       end # AfterInstallArtifact

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

@@ -3,11 +3,11 @@ module Dapp
     module Stage
       # AfterSetupArtifact
       class AfterSetupArtifact < ArtifactDefault
-        def initialize(application, next_stage)
-          @prev_stage = if application.artifact?
-                          SetupGroup::ChefCookbooks.new(application, self)
+        def initialize(dimg, next_stage)
+          @prev_stage = if dimg.artifact?
+                          SetupGroup::ChefCookbooks.new(dimg, self)
                         else
-                          SetupGroup::GAPostSetupPatch.new(application, self)
+                          SetupGroup::GAPostSetupPatch.new(dimg, self)
                         end
           super
         end

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

@@ -9,17 +9,17 @@ module Dapp
 
         def prepare_image
           super
-          artifacts_applications_build!
+          artifacts_dimgs_build!
           artifacts_labels = {}
           artifacts.each do |artifact|
             apply_artifact(artifact, image)
-            artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:app].send(:last_stage).image.built_id
+            artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:dimg].send(:last_stage).image.built_id
           end
           image.add_service_change_label artifacts_labels
         end
 
         def images
-          [image].concat(artifacts.map { |artifact| artifact[:app].images }.flatten)
+          [image].concat(artifacts.map { |artifact| artifact[:dimg].images }.flatten)
         end
 
         protected
@@ -34,43 +34,43 @@ module Dapp
 
         def artifacts
           @artifacts ||= begin
-            application.config.public_send("_#{name}").map do |artifact|
-              app = Dapp::Artifact.new(config: artifact._config,
-                                       project: application.project,
-                                       ignore_git_fetch: application.ignore_git_fetch)
-              { name: artifact._config._name, options: artifact._artifact_options, app: app }
+            dimg.config.public_send("_#{name}").map do |artifact|
+              artifact_dimg = Dapp::Artifact.new(config: artifact._config,
+                                                 project: dimg.project,
+                                                 ignore_git_fetch: dimg.ignore_git_fetch)
+              { name: artifact._config._name, options: artifact._artifact_options, dimg: artifact_dimg }
             end
           end
         end
 
         def artifacts_signatures
-          artifacts.map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
+          artifacts.map { |artifact| hashsum [artifact[:dimg].signature, artifact[:options]] }
         end
 
-        def artifacts_applications_build!
+        def artifacts_dimgs_build!
           artifacts.each do |artifact|
-            process = application.project.t(code: 'process.artifact_building', data: { name: artifact[:name] })
-            application.project.log_secondary_process(process,
-                                                      short: !application.project.log_verbose?,
-                                                      quiet: application.artifact? && !application.project.log_verbose?) do
-              application.project.with_log_indent do
-                artifact[:app].build!
+            process = dimg.project.t(code: 'process.artifact_building', data: { name: artifact[:name] })
+            dimg.project.log_secondary_process(process,
+                                               short: !dimg.project.log_verbose?,
+                                               quiet: dimg.artifact? && !dimg.project.log_verbose?) do
+              dimg.project.with_log_indent do
+                artifact[:dimg].build!
               end
             end
           end
         end
 
         # rubocop:disable Metrics/AbcSize
-        def run_artifact_app(app, artifact_name, commands)
+        def run_artifact_dimg(artifact_dimg, artifact_name, commands)
           docker_options = ['--rm',
-                            "--volume #{application.tmp_path('artifact', artifact_name)}:#{app.container_tmp_path(artifact_name)}",
-                            "--volumes-from #{application.project.base_container}",
-                            "--entrypoint #{application.project.bash_path}"]
-          application.project.log_secondary_process(application.project.t(code: 'process.artifact_copy',
-                                                                          data: { name: artifact_name }),
-                                                    short: true,
-                                                    quiet: application.artifact? && !application.project.log_verbose?) do
-            app.run(docker_options, [%(-ec '#{application.project.shellout_pack(commands)}')])
+                            "--volume #{dimg.tmp_path('artifact', artifact_name)}:#{artifact_dimg.container_tmp_path(artifact_name)}",
+                            "--volumes-from #{dimg.project.base_container}",
+                            "--entrypoint #{dimg.project.bash_path}"]
+          dimg.project.log_secondary_process(dimg.project.t(code: 'process.artifact_copy',
+                                                            data: { name: artifact_name }),
+                                             short: true,
+                                             quiet: dimg.artifact? && !dimg.project.log_verbose?) do
+            artifact_dimg.run(docker_options, [%(-ec '#{dimg.project.shellout_pack(commands)}')])
           end
         end
         # rubocop:enable Metrics/AbcSize

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

@@ -7,30 +7,30 @@ module Dapp
 
         # rubocop:disable Metrics/AbcSize
         def apply_artifact(artifact, image)
-          return if application.project.dry_run?
+          return if dimg.project.dry_run?
 
           artifact_name = artifact[:name]
-          app = artifact[:app]
+          artifact_dimg = artifact[:dimg]
           cwd = artifact[:options][:cwd]
-          paths = artifact[:options][:paths]
+          include_paths = artifact[:options][:include_paths]
           exclude_paths = artifact[:options][:exclude_paths]
           owner = artifact[:options][:owner]
           group = artifact[:options][:group]
-          where_to_add = artifact[:options][:where_to_add]
+          to = artifact[:options][:to]
 
-          command = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid, cwd, paths, exclude_paths)
-          run_artifact_app(app, artifact_name, command)
+          command = safe_cp(to, artifact_dimg.container_tmp_path(artifact_name), Process.uid, Process.gid, cwd, include_paths, exclude_paths)
+          run_artifact_dimg(artifact_dimg, artifact_name, command)
 
-          command = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, '', paths, exclude_paths)
+          command = safe_cp(dimg.container_tmp_path('artifact', artifact_name), to, owner, group, '', include_paths, exclude_paths)
           image.add_command command
-          image.add_volume "#{application.tmp_path('artifact', artifact_name)}:#{application.container_tmp_path('artifact', artifact_name)}:ro"
+          image.add_volume "#{dimg.tmp_path('artifact', artifact_name)}:#{dimg.container_tmp_path('artifact', artifact_name)}:ro"
         end
         # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         private
 
         # rubocop:disable Metrics/ParameterLists, Metrics/AbcSize, Metrics/MethodLength
-        def safe_cp(from, to, owner, group, cwd = '', paths = [], exclude_paths = [])
+        def safe_cp(from, to, owner, group, cwd = '', include_paths = [], exclude_paths = [])
           credentials = ''
           credentials += "-o #{owner} " if owner
           credentials += "-g #{group} " if group
@@ -39,18 +39,18 @@ module Dapp
           copy_files = proc do |from_, cwd_, path_ = ''|
             cwd_ = File.expand_path(File.join('/', cwd_))
             "if [[ -d #{File.join(from_, cwd_, path_)} ]]; then " \
-            "#{application.project.find_path} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
-            "#{application.project.bash_path} -ec '#{application.project.install_path} -D #{credentials} {} " \
+            "#{dimg.project.find_path} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
+            "#{dimg.project.bash_path} -ec '#{dimg.project.install_path} -D #{credentials} {} " \
             "#{File.join(to, '$(echo {} | ' \
-            "#{application.project.sed_path} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\; ;" \
+            "#{dimg.project.sed_path} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\; ;" \
             'fi'
           end
 
           commands = []
-          commands << [application.project.install_path, credentials, '-d', to].join(' ')
-          commands.concat(paths.empty? ? Array(copy_files.call(from, cwd)) : paths.map { |path| copy_files.call(from, cwd, path) })
-          commands << "#{application.project.find_path} #{to} -type d -exec " \
-                      "#{application.project.bash_path} -ec '#{application.project.install_path} -d #{credentials} {}' \\;"
+          commands << [dimg.project.install_path, credentials, '-d', to].join(' ')
+          commands.concat(include_paths.empty? ? Array(copy_files.call(from, cwd)) : include_paths.map { |path| copy_files.call(from, cwd, path) })
+          commands << "#{dimg.project.find_path} #{to} -type d -exec " \
+                      "#{dimg.project.bash_path} -ec '#{dimg.project.install_path} -d #{credentials} {}' \\;"
           commands.join(' && ')
         end
         # rubocop:enable Metrics/ParameterLists, Metrics/AbcSize, Metrics/MethodLength

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

@@ -8,10 +8,10 @@ module Dapp
         include Mod::Logging
 
         attr_accessor :prev_stage, :next_stage
-        attr_reader :application
+        attr_reader :dimg
 
-        def initialize(application, next_stage)
-          @application = application
+        def initialize(dimg, next_stage)
+          @dimg = dimg
 
           @next_stage = next_stage
           @next_stage.prev_stage = self
@@ -19,14 +19,14 @@ module Dapp
 
         # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
         def build_lock!
-          return yield if application.project.dry_run?
+          return yield if dimg.project.dry_run?
 
           try_lock = proc do
             next yield unless should_be_tagged?
 
             no_lock = false
 
-            application.project.lock("#{application.config._basename}.image.#{image.name}") do
+            dimg.project.lock("#{dimg.project.name}.image.#{image.name}") do
               image.cache_reset
 
               if should_be_tagged?
@@ -60,7 +60,7 @@ module Dapp
         def save_in_cache!
           prev_stage.save_in_cache! if prev_stage
           return unless should_be_tagged?
-          image.save_in_cache! unless application.project.dry_run?
+          image.tag! unless dimg.project.dry_run?
         end
 
         def image
@@ -68,37 +68,48 @@ module Dapp
             if empty?
               prev_stage.image
             else
-              Image::Stage.new(name: image_name, from: from_image, project: application.project)
+              Image::Stage.new(name: image_name, from: from_image, project: dimg.project)
             end
           end
         end
 
         def prepare_image
-          return if application.project.dry_run?
-          image.add_volumes_from application.project.base_container
-          image_add_tmp_volumes(:tmp)
-          image_add_tmp_volumes(:build)
-          image.add_service_change_label dapp: application.stage_dapp_label
+          return if dimg.project.dry_run?
+          image.add_volumes_from dimg.project.base_container
+          image_add_volumes
+          image.add_service_change_label dapp: dimg.stage_dapp_label
           image.add_service_change_label 'dapp-cache-version'.to_sym => Dapp::BUILD_CACHE_VERSION
-          image.add_service_change_label 'dapp-dev-mode'.to_sym => true if application.dev_mode?
 
-          if application.project.ssh_auth_sock
-            image.add_volume "#{application.project.ssh_auth_sock}:/tmp/dapp-ssh-agent"
+          if dimg.project.ssh_auth_sock
+            image.add_volume "#{dimg.project.ssh_auth_sock}:/tmp/dapp-ssh-agent"
             image.add_env 'SSH_AUTH_SOCK', '/tmp/dapp-ssh-agent'
           end
         end
 
-        def image_add_tmp_volumes(type)
-          (application.config.public_send("_#{type}_dir")._store +
+        def image_add_volumes
+          image_add_tmp_volumes
+          image_add_build_volumes
+        end
+
+        def image_add_tmp_volumes
+          image_add_default_volumes(:tmp_dir)
+        end
+
+        def image_add_build_volumes
+          image_add_default_volumes(:build_dir)
+        end
+
+        def image_add_default_volumes(type)
+          (dimg.config.public_send("_#{type}_mount").map(&:to) +
             from_image.labels.select { |l, _| l == "dapp-#{type}-dir" }.map { |_, value| value.split(';') }.flatten).each do |path|
             absolute_path = File.expand_path(File.join('/', path))
-            tmp_path = application.send("#{type}_path", 'mount', absolute_path[1..-1]).tap(&:mkpath)
+            tmp_path = dimg.send("#{type}_path", 'mount', absolute_path[1..-1]).tap(&:mkpath)
             image.add_volume "#{tmp_path}:#{absolute_path}"
           end
         end
 
         def image_should_be_build?
-          !empty? || application.project.log_verbose?
+          !empty? || dimg.project.log_verbose?
         end
 
         def empty?
@@ -113,13 +124,7 @@ module Dapp
           if empty?
             prev_stage.signature
           else
-            args = []
-            args << prev_stage.signature unless prev_stage.nil?
-            args << application.build_cache_version
-            args << builder_checksum
-            args.concat(dependencies.flatten)
-
-            hashsum args
+            hashsum [prev_stage.signature, builder_checksum, *dependencies.flatten]
           end
         end
 
@@ -137,7 +142,7 @@ module Dapp
         end
 
         def should_be_skipped?
-          image.tagged? && !application.project.log_verbose? && !should_be_introspected?
+          image.tagged? && !dimg.project.log_verbose? && !should_be_introspected?
         end
 
         def should_be_tagged?
@@ -150,7 +155,7 @@ module Dapp
         end
 
         def image_name
-          application.stage_cache_format % { signature: signature }
+          dimg.stage_cache_format % { signature: signature }
         end
 
         def from_image
@@ -164,15 +169,15 @@ module Dapp
         end
 
         def dependencies_files_checksum(regs)
-          regs.map! { |reg| File.directory?(File.join(application.project.path, reg)) ? File.join(reg, '**', '*') : reg }
-          unless (files = regs.map { |reg| Dir[File.join(application.project.path, reg)].map { |f| File.read(f) if File.file?(f) } }).empty?
+          regs.map! { |reg| File.directory?(File.join(dimg.project.path, reg)) ? File.join(reg, '**', '*') : reg }
+          unless (files = regs.map { |reg| Dir[File.join(dimg.project.path, reg)].map { |f| File.read(f) if File.file?(f) } }).empty?
             hashsum files
           end
         end
 
         def change_options
           @change_options ||= begin
-            application.config._docker._change_options.to_h.delete_if do |_, val|
+            dimg.config._docker._change_options.to_h.delete_if do |_, val|
               val.nil? || (val.respond_to?(:empty?) && val.empty?)
             end
           end