dapp 0.14.11 → 0.14.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad114008afe7eb82b0d3ad627dabaccd88bcfcf
-  data.tar.gz: fc5442598b8110af32df65852993e4b194691f4c
+  metadata.gz: 13bccb197061f7d78e8f74f498248f6aa2c19833
+  data.tar.gz: d5a9c8d733f8d3f9562d3af9219930220aa78c90
 SHA512:
-  metadata.gz: 98fa765aa71da71698636960cb085f29e2bf4e08fc28c16d4f39339e000304904719c63a8658736217a99a5aa988d9a8ad3210ca8884af8ce9261f78bfe6945c
-  data.tar.gz: e6a9b8fb77875c16d69be688d60cc82488db0d316717edcb13dd9636e87992374659810499f6b55a256da3f906f20749d1f04768636adc096fad2898ee2753fd
+  metadata.gz: ca8cf1edb04f43bfac8303ff27696214ce848a013d04c2c19c3e1ffa8f81274032f1e1a533459d1dce5b31a634a191e632b99d96880b9cc9030bef27e27320f9
+  data.tar.gz: b7a031ef19524e04b38cb274d5ddd5261275ffe94591401001eee285a9eff17ac78264ff39de5dc6cef1d1ad658ae95906ba54e265d83c8db7a44c8b7e2fdfbf

data/lib/dapp/dapp.rb

@@ -98,21 +98,26 @@ module Dapp
       name
     end
 
-    def host_docker_bin
-      self.class.host_docker_bin
+    def host_docker
+      self.class.host_docker
     end
 
-    def self.host_docker_bin
-      @host_docker_bin ||= begin
+    def self.host_docker
+      @host_docker ||= begin
         raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
-        res.stdout.strip.tap do |docker_bin|
-          current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
-          required_docker_version = '1.10.0'
+        docker_bin = res.stdout.strip
 
-          if Gem::Version.new(required_docker_version) >= Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
-            raise Error::Dapp, code: :docker_version, data: { version: required_docker_version }
-          end
+        current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
+        required_docker_version = '1.10.0'
+
+        if Gem::Version.new(required_docker_version) >= Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
+          raise Error::Dapp, code: :docker_version, data: { version: required_docker_version }
         end
+
+        [].tap do |cmd|
+          cmd << docker_bin
+          cmd << "--config #{ENV['DAPP_DOCKER_CONFIG']}" if ENV.key?('DAPP_DOCKER_CONFIG')
+        end.join(' ')
       end
     end
   end # Dapp

data/lib/dapp/dapp/deps/base.rb

@@ -10,10 +10,10 @@ module Dapp
 
         def base_container
           @base_container ||= begin
-            if shellout("#{host_docker_bin} inspect #{base_container_name}").exitstatus.nonzero?
+            if shellout("#{host_docker} inspect #{base_container_name}").exitstatus.nonzero?
               log_secondary_process(t(code: 'process.base_container_creating'), short: true) do
                 shellout!(
-                  ["#{host_docker_bin} create",
+                  ["#{host_docker} create",
                    "--name #{base_container_name}",
                    "--volume /.dapp/deps/base/#{BASE_VERSION} dappdeps/base:#{BASE_VERSION}"].join(' ')
                 )

data/lib/dapp/dapp/deps/gitartifact.rb

@@ -10,10 +10,10 @@ module Dapp
 
         def gitartifact_container
           @gitartifact_container ||= begin
-            if shellout("#{host_docker_bin} inspect #{gitartifact_container_name}").exitstatus.nonzero?
+            if shellout("#{host_docker} inspect #{gitartifact_container_name}").exitstatus.nonzero?
               log_secondary_process(t(code: 'process.gitartifact_container_creating'), short: true) do
                 shellout!(
-                  ["#{host_docker_bin} create",
+                  ["#{host_docker} create",
                    "--name #{gitartifact_container_name}",
                    "--volume /.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}",
                    "dappdeps/gitartifact:#{GITARTIFACT_VERSION}"].join(' ')

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

@@ -54,10 +54,10 @@ module Dapp
 
       def chefdk_container
         @chefdk_container ||= begin
-          if dimg.dapp.shellout("#{dimg.dapp.host_docker_bin} inspect #{chefdk_container_name}").exitstatus.nonzero?
+          if dimg.dapp.shellout("#{dimg.dapp.host_docker} inspect #{chefdk_container_name}").exitstatus.nonzero?
             dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.chefdk_container_creating'), short: true) do
               dimg.dapp.shellout!(
-                ["#{dimg.dapp.host_docker_bin} create",
+                ["#{dimg.dapp.host_docker} create",
                  "--name #{chefdk_container_name}",
                  "--volume /.dapp/deps/chefdk #{chefdk_image}"].join(' ')
               )

data/lib/dapp/dimg/builder/chef/cookbook.rb

@@ -107,7 +107,7 @@ module Dapp
           ]
 
           builder.dimg.dapp.shellout!(
-            [ "#{builder.dimg.dapp.host_docker_bin} run --rm",
+            [ "#{builder.dimg.dapp.host_docker} run --rm",
               volumes_from.map {|container| "--volumes-from #{container}"}.join(' '),
               *local_paths.map {|path| "--volume #{path}:#{path}"},
               "--volume #{builder.dimg.tmp_path}:#{builder.dimg.tmp_path}",

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

@@ -65,6 +65,11 @@ BANNER
         option :build_context_directory,
                long: '--build-context-directory DIR_PATH',
                default: nil
+
+        option :use_system_tar,
+               long: '--use-system-tar',
+               boolean: true,
+               default: false
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Dapp
                 dapp_containers_flush
                 dapp_dangling_images_flush
                 remove_images_by_query([
-                  "#{host_docker_bin} images",
+                  "#{host_docker} images",
                   %(--format '{{if ne "#{stage_cache}" .Repository }}{{.Repository}}:{{.Tag}}{{ end }}'),
                   %(-f "label=dapp=#{stage_dapp_label}")
                 ].join(' ')) # FIXME: negative filter is not currently supported by the Docker CLI

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

@@ -6,19 +6,19 @@ module Dapp
           protected
 
           def dapp_images_names
-            shellout!(%(#{host_docker_bin} images --format="{{.Repository}}:{{.Tag}}" #{stage_cache})).stdout.lines.map(&:strip)
+            shellout!(%(#{host_docker} images --format="{{.Repository}}:{{.Tag}}" #{stage_cache})).stdout.lines.map(&:strip)
           end
 
           def dapp_images_ids
-            shellout!(%(#{host_docker_bin} images #{stage_cache} -q --no-trunc)).stdout.lines.map(&:strip)
+            shellout!(%(#{host_docker} images #{stage_cache} -q --no-trunc)).stdout.lines.map(&:strip)
           end
 
           def dapp_containers_flush
-            remove_containers_by_query(%(#{host_docker_bin} ps -a -f "label=dapp" -f "name=#{container_name_prefix}" -q), force: true)
+            remove_containers_by_query(%(#{host_docker} ps -a -f "label=dapp" -f "name=#{container_name_prefix}" -q), force: true)
           end
 
           def dapp_dangling_images_flush
-            remove_images_by_query(%(#{host_docker_bin} images -f "dangling=true" -f "label=dapp=#{stage_dapp_label}" -q), force: true)
+            remove_images_by_query(%(#{host_docker} images -f "dangling=true" -f "label=dapp=#{stage_dapp_label}" -q), force: true)
           end
 
           def remove_images_by_query(images_query, force: false)
@@ -28,13 +28,13 @@ module Dapp
           def remove_images(ids, force: false)
             ids.uniq!
             check_user_containers!(ids) unless force
-            remove_base("#{host_docker_bin} rmi%{force_option} %{ids}", ids, force: force)
+            remove_base("#{host_docker} rmi%{force_option} %{ids}", ids, force: force)
           end
 
           def check_user_containers!(images_ids)
             return if images_ids.empty?
             log_step_with_indent(:'check user containers') do
-              run_command(%(#{host_docker_bin} ps -a -q #{images_ids.uniq.map { |image_id| "--filter=ancestor=#{image_id}" }.join(' ')})).tap do |res|
+              run_command(%(#{host_docker} ps -a -q #{images_ids.uniq.map { |image_id| "--filter=ancestor=#{image_id}" }.join(' ')})).tap do |res|
                 raise Error::Command, code: :user_containers_detected, data: { ids: res.stdout.strip } if res && !res.stdout.strip.empty? && !dry_run?
               end
             end
@@ -45,7 +45,7 @@ module Dapp
           end
 
           def remove_containers(ids, force: false)
-            remove_base("#{host_docker_bin} rm%{force_option} %{ids}", ids.uniq, force: force)
+            remove_base("#{host_docker} rm%{force_option} %{ids}", ids.uniq, force: force)
           end
 
           def remove_base(query_format, ids, force: false)

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

@@ -45,11 +45,11 @@ module Dapp
           end
 
           def dapp_containers_flush_by_label(label)
-            remove_containers_by_query(%(#{host_docker_bin} ps -a -f "label=#{label}" -q), force: true)
+            remove_containers_by_query(%(#{host_docker} ps -a -f "label=#{label}" -q), force: true)
           end
 
           def dapp_dangling_images_flush_by_label(label)
-            remove_images_by_query(%(#{host_docker_bin} images -f "dangling=true" -f "label=#{label}" -q), force: true)
+            remove_images_by_query(%(#{host_docker} images -f "dangling=true" -f "label=#{label}" -q), force: true)
           end
 
           def dapp_images_flush_by_label(label)
@@ -59,7 +59,7 @@ module Dapp
 
           def dapp_images_by_label(label)
             @dapp_images ||= begin
-              shellout!(%(#{host_docker_bin} images -f "dangling=false" --format="{{.Repository}}:{{.Tag}}" -f "label=#{label}"))
+              shellout!(%(#{host_docker} images -f "dangling=false" --format="{{.Repository}}:{{.Tag}}" -f "label=#{label}"))
                 .stdout
                 .lines
                 .map(&:strip)
@@ -68,7 +68,7 @@ module Dapp
 
           def proper_cache_all_images
             shellout!([
-              "#{host_docker_bin} images",
+              "#{host_docker} images",
               '--format="{{.Repository}}:{{.Tag}}"',
               %(-f "label=dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}" -f "dangling=false")
             ].join(' ')).stdout.lines.map(&:strip)

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

@@ -51,7 +51,7 @@ module Dapp
             def actual_cache_images
               @actual_cache_images ||= begin
                 shellout!([
-                  "#{host_docker_bin} images",
+                  "#{host_docker} images",
                   '--format="{{.Repository}}:{{.Tag}}"',
                   %(-f "label=dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}"),
                   stage_cache
@@ -60,7 +60,7 @@ module Dapp
             end
 
             def dapp_images_hash
-              shellout!(%(#{host_docker_bin} images --format "{{.Repository}}:{{.Tag}};{{.ID}}" --no-trunc #{stage_cache})).stdout.lines.map do |line|
+              shellout!(%(#{host_docker} images --format "{{.Repository}}:{{.Tag}};{{.ID}}" --no-trunc #{stage_cache})).stdout.lines.map do |line|
                 line.strip.split(';')
               end.to_h
             end
@@ -79,7 +79,7 @@ module Dapp
             end
 
             def image_exist?(image_id)
-              shellout!(%(#{host_docker_bin} inspect #{image_id}))
+              shellout!(%(#{host_docker} inspect #{image_id}))
               true
             rescue ::Dapp::Error::Shellout
               false
@@ -90,7 +90,7 @@ module Dapp
             end
 
             def image_parent(image_id)
-              shellout!(%(#{host_docker_bin} inspect -f {{.Parent}} #{image_id})).stdout.strip
+              shellout!(%(#{host_docker} inspect -f {{.Parent}} #{image_id})).stdout.strip
             end
 
             def proper_git_commit
@@ -109,7 +109,7 @@ module Dapp
             def dapp_images_detailed
               @dapp_images_detailed ||= {}.tap do |images|
                 dapp_images_names.each do |image_name|
-                  shellout!(%(#{host_docker_bin} inspect --format='{{json .}}' #{image_name})).stdout.strip.tap do |output|
+                  shellout!(%(#{host_docker} inspect --format='{{json .}}' #{image_name})).stdout.strip.tap do |output|
                     images[image_name] = output == 'null' ? {} : JSON.parse(output)
                   end
                 end

data/lib/dapp/dimg/dimg.rb

@@ -120,7 +120,7 @@ module Dapp
       end
 
       def run(docker_options, command)
-        cmd = "#{dapp.host_docker_bin} run #{[docker_options, last_stage.image.built_id, command].flatten.compact.join(' ')}"
+        cmd = "#{dapp.host_docker} run #{[docker_options, last_stage.image.built_id, command].flatten.compact.join(' ')}"
         if dapp.dry_run?
           dapp.log(cmd)
         else
@@ -157,7 +157,7 @@ module Dapp
       end
 
       def introspect_image!(image:, options:)
-        cmd = "#{dapp.host_docker_bin} run -ti --rm --entrypoint #{dapp.bash_bin} #{options} #{image}"
+        cmd = "#{dapp.host_docker} run -ti --rm --entrypoint #{dapp.bash_bin} #{options} #{image}"
         system(cmd)
       end
 
@@ -167,7 +167,7 @@ module Dapp
         # Чтобы от них избавиться — запускаем docker-контейнер под root-пользователем
         # и удаляем примонтированную tmp-директорию.
         cmd = "".tap do |cmd|
-          cmd << "#{dapp.host_docker_bin} run --rm"
+          cmd << "#{dapp.host_docker} run --rm"
           cmd << " --volume #{dapp.tmp_base_dir}:#{dapp.tmp_base_dir}"
           cmd << " alpine:3.6"
           cmd << " rm -rf #{tmp_path}"

data/lib/dapp/dimg/git_artifact.rb

@@ -67,13 +67,13 @@ module Dapp
             when :directory
               stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'directory'
 
-              commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
-              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C #{to}"
+              commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
+              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C \"#{to}\""
             when :file
               stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'file'
 
-              commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{File.dirname(to)}"
-              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C #{File.dirname(to)}"
+              commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
+              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C \"#{File.dirname(to)}\""
             end
           end
         end
@@ -89,14 +89,14 @@ module Dapp
             if any_changes?(*dev_patch_stage_commits(stage))
               case archive_type
               when :directory
-                changed_files = diff_patches(*dev_patch_stage_commits(stage)).map {|p| File.join(to, cwd, p.delta.new_file[:path])}
+                changed_files = diff_patches(*dev_patch_stage_commits(stage)).map {|p| "\"#{File.join(to, cwd, p.delta.new_file[:path])}\""}
                 commands << "#{repo.dimg.dapp.rm_bin} -rf #{changed_files.join(' ')}"
-                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
-                commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C #{to}"
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
+                commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C \"#{to}\""
               when :file
-                commands << "#{repo.dimg.dapp.rm_bin} -rf #{to}"
-                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{File.dirname(to)}"
-                commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C #{File.dirname(to)}"
+                commands << "#{repo.dimg.dapp.rm_bin} -rf \"#{to}\""
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
+                commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C \"#{File.dirname(to)}\""
               else
                 raise
               end
@@ -105,11 +105,11 @@ module Dapp
             if patch_any_changes?(stage)
               case archive_type
               when :directory
-                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
-                commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=#{to} --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
+                commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=\"#{to}\" --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
               when :file
-                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{File.dirname(to)}"
-                commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=#{File.dirname(to)} --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
+                commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=\"#{File.dirname(to)}\" --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
               else
                 raise
               end
@@ -213,33 +213,65 @@ module Dapp
       end
 
       def archive_file(stage, from_commit, to_commit)
-        tar_write(repo.dimg.tmp_path('archives', archive_file_name(from_commit, to_commit))) do |tar|
-          diff_patches(from_commit, to_commit).each do |patch|
-            entry = patch.delta.new_file
-
-            content = begin
-              if to_commit == nil
-                next unless (path = repo.path.dirname.join(entry[:path])).file?
-                File.read(path)
-              else
-                repo.lookup_object(entry[:oid]).content
-              end
-            end
+        if repo.dimg.dapp.options[:use_system_tar]
+          archive_file_with_system_tar(stage, from_commit, to_commit)
+        else
+          archive_file_with_tar_writer(stage, from_commit, to_commit)
+        end
+        repo.dimg.container_tmp_path('archives', archive_file_name(from_commit, to_commit))
+      end
 
-            if entry[:mode] == 40960 # symlink
-              tar.add_symlink slice_cwd(stage, entry[:path]), content, entry[:mode]
+      def archive_file_with_tar_writer(stage, from_commit, to_commit)
+        tar_write(repo.dimg.tmp_path('archives', archive_file_name(from_commit, to_commit))) do |tar|
+          archive_diff_pathes(stage,from_commit, to_commit) do |path, content, mode|
+            if mode == 40960 # symlink
+              tar.add_symlink path, content, mode
             else
-              tar.add_file slice_cwd(stage, entry[:path]), entry[:mode] do |tf|
+              tar.add_file path, mode do |tf|
                 tf.write content
               end
             end
           end
         end
-        repo.dimg.container_tmp_path('archives', archive_file_name(from_commit, to_commit))
       rescue Gem::Package::TooLongFileName => e
         raise Error::TarWriter, message: e.message
       end
 
+      def archive_file_with_system_tar(stage, from_commit, to_commit)
+        repo.dimg.tmp_path('archives', archive_file_name(from_commit, to_commit)).tap do |archive_path|
+          relative_archive_file_path = File.join('archives_files', file_name(from_commit, to_commit))
+          archive_diff_pathes(stage, from_commit, to_commit) do |path, content, mode|
+            file_path = repo.dimg.tmp_path(relative_archive_file_path, path)
+
+            if mode == 40960 # symlink
+              FileUtils.symlink(content, file_path)
+            else
+              IO.write(file_path, content)
+              FileUtils.chmod(mode, file_path)
+            end
+          end
+
+          repo.dimg.dapp.shellout!("tar -C #{repo.dimg.tmp_path(relative_archive_file_path)} -cf #{archive_path} .")
+        end
+      end
+
+      def archive_diff_pathes(stage, from_commit, to_commit)
+        diff_patches(from_commit, to_commit).each do |patch|
+          entry = patch.delta.new_file
+
+          content = begin
+            if to_commit == nil
+              next unless (path = repo.path.dirname.join(entry[:path])).file?
+              File.read(path)
+            else
+              repo.lookup_object(entry[:oid]).content
+            end
+          end
+
+          yield slice_cwd(stage, entry[:path]), content, entry[:mode]
+        end
+      end
+
       def slice_cwd(stage, path)
         return path if cwd.empty?
 
@@ -248,6 +280,7 @@ module Dapp
           path
             .reverse
             .chomp(cwd.reverse)
+            .chomp('/')
             .reverse
         when :file
           File.basename(to)
@@ -257,7 +290,7 @@ module Dapp
       end
 
       def archive_file_name(from_commit, to_commit)
-        file_name(from_commit, to_commit, 'tar')
+        file_name(from_commit, to_commit, ext: 'tar')
       end
 
       def patch_file(stage, from_commit, to_commit)
@@ -271,7 +304,7 @@ module Dapp
       def change_patch_new_file_path(stage, patch)
         patch.to_s.lines.tap do |lines|
           modify_patch_line = proc do |line_number, path_char|
-            action_part, path_part = lines[line_number].split
+            action_part, path_part = lines[line_number].strip.split(' ', 2)
             if (path_with_cwd = path_part.partition("#{path_char}/").last).start_with?(cwd)
               native_path = case archive_type
               when :directory
@@ -321,11 +354,11 @@ module Dapp
       end
 
       def patch_file_name(from_commit, to_commit)
-        file_name(from_commit, to_commit, 'patch')
+        file_name(from_commit, to_commit, ext: 'patch')
       end
 
-      def file_name(*args, ext)
-        "#{[paramshash, args].flatten.compact.join('_')}.#{ext}"
+      def file_name(*args, ext: nil)
+        "#{[paramshash, args].flatten.compact.join('_')}#{".#{ext}" unless ext.nil? }"
       end
 
       def diff_patches(from_commit, to_commit, paths: include_paths_or_cwd)

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

@@ -22,21 +22,21 @@ module Dapp
 
         def untag!
           raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
-          dapp.shellout!("#{dapp.host_docker_bin} rmi #{name}")
+          dapp.shellout!("#{dapp.host_docker} rmi #{name}")
           cache_reset
         end
 
         def push!
           raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
           dapp.log_secondary_process(dapp.t(code: 'process.image_push', data: { name: name })) do
-            dapp.shellout!("#{dapp.host_docker_bin} push #{name}", verbose: true)
+            dapp.shellout!("#{dapp.host_docker} push #{name}", verbose: true)
           end
         end
 
         def pull!
           return if tagged?
           dapp.log_secondary_process(dapp.t(code: 'process.image_pull', data: { name: name })) do
-            dapp.shellout!("#{dapp.host_docker_bin} pull #{name}", verbose: true)
+            dapp.shellout!("#{dapp.host_docker} pull #{name}", verbose: true)
           end
           cache_reset
         end
@@ -56,7 +56,7 @@ module Dapp
         end
 
         def self.image_config_option(image_id:, option:)
-          output = ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
+          output = ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
           output == 'null' ? [] : JSON.parse(output)
         end
 
@@ -88,17 +88,17 @@ module Dapp
           end
 
           def tag!(id:, tag:, verbose: false, quiet: false)
-            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} tag #{id} #{tag}", verbose: verbose, quiet: quiet)
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} tag #{id} #{tag}", verbose: verbose, quiet: quiet)
             cache_reset
           end
 
           def save!(image_or_images, file_path, verbose: false, quiet: false)
             images = Array(image_or_images).join(' ')
-            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} save -o #{file_path} #{images}", verbose: verbose, quiet: quiet)
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} save -o #{file_path} #{images}", verbose: verbose, quiet: quiet)
           end
 
           def load!(file_path, verbose: false, quiet: false)
-            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} load -i #{file_path}", verbose: verbose, quiet: quiet)
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} load -i #{file_path}", verbose: verbose, quiet: quiet)
           end
 
           def cache
@@ -107,7 +107,7 @@ module Dapp
 
           def cache_reset(name = '')
             cache.delete(name)
-            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker_bin} images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}")
+            ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}")
                         .stdout
                         .lines
                         .each do |l|

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

@@ -25,7 +25,7 @@ module Dapp
           run!
           @built_id = commit!
         ensure
-          dapp.shellout("#{dapp.host_docker_bin} rm #{container_name}")
+          dapp.shellout("#{dapp.host_docker} rm #{container_name}")
         end
 
         def built?
@@ -70,7 +70,7 @@ module Dapp
 
         def run!
           raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
-          dapp.shellout!("#{dapp.host_docker_bin} run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", verbose: true)
+          dapp.shellout!("#{dapp.host_docker} run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", verbose: true)
         rescue ::Dapp::Error::Shellout => error
           dapp.log_warning(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container })
 
@@ -83,7 +83,7 @@ module Dapp
         end
 
         def commit!
-          dapp.shellout!("#{dapp.host_docker_bin} commit #{prepared_change} #{container_name}").stdout.strip
+          dapp.shellout!("#{dapp.host_docker} commit #{prepared_change} #{container_name}").stdout.strip
         end
 
         def clone!(name)

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

@@ -64,7 +64,7 @@ spec:
           secretName: {{ .Chart.Name }}-backend
       containers:
       - command: [ '/bin/bash', '-l', '-c', 'bundle exec ctl start' ]
-        image: {{ tuple . 'specific_name' | include "dimg" }} # or nameless dimg {{ tuple . | include "dimg" }}
+        image: {{ tuple "specific-name" . | include "dimg" }} # or nameless dimg {{ tuple . | include "dimg" }}
         imagePullPolicy: Always
         name: {{ .Chart.Name }}-backend
         livenessProbe:

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

@@ -79,10 +79,10 @@ module Dapp
 {{- if (ge (len (index .)) 2) -}}
 {{- $name := index . 0 -}}
 {{- $context := index . 1 -}}
-{{- printf "%s:%s-%s" $context.Values.global.dapp.repo $name $context.Values.global.dapp.image_version -}}
+{{- printf "%v:%v-%v" $context.Values.global.dapp.repo $name $context.Values.global.dapp.image_version -}}
 {{- else -}}
 {{- $context := index . 0 -}}
-{{- printf "%s:%s" $context.Values.global.dapp.repo $context.Values.global.dapp.image_version -}}
+{{- printf "%v:%v" $context.Values.global.dapp.repo $context.Values.global.dapp.image_version -}}
 {{- end -}}
 {{- end -}}
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.11'.freeze
+  VERSION = '0.14.12'.freeze
   BUILD_CACHE_VERSION = 16
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.14.11
+  version: 0.14.12
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout