dapp 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753069f8c28bcede5ca0d3f6f5f5419135c7fab9
-  data.tar.gz: 88812ab9b681784bec6288903e34be896b78a861
+  metadata.gz: 6e413ad01ef18d652b7dbda03c0b68ebbd62b1d0
+  data.tar.gz: 207e309aedd9d439e673fbaabdfc1e50cb9a5a10
 SHA512:
-  metadata.gz: 0ceb1e79ce7906f40384410cab6d35098e3dffe2e591194e74e6b4a8beb01453a995634d037c6113a6c7aaf09c2868b0e5b8afd6e81b6f25d9f05dce851e8cb4
-  data.tar.gz: 2ab1fc615718fae7ffc543e84dd1979be9ca97e4b1c5f89c8ec5d10c64fcdb5209920e7842494f4fecd5afbad81c0359c21958236e1b8931c894f6e4e5282ff6
+  metadata.gz: c9dfe160397e55ec631e6e2b3bd471308e45d64c62bb54b504d9a1e88a024a664844b99958431d7c13b6ec11b51be0ab6d70cadb72a0364f453ec1ecb1f5243f
+  data.tar.gz: 9b6b84bcc8f0f62b0d1c0c503eafc9607a57e350123d3f4999b6498f8d94e3d9cb422c949599b6af2d093effe4dbe51a5ef789ce3201de157c70ffab09f52546

data/config/en/common.yml

@@ -18,10 +18,10 @@ en:
       berks_vendor: 'vendoring cookbooks'
       chef_cookbooks_stage_berks_vendor: 'vendoring cookbooks for chef cookbooks stage'
       waiting_resouce_lock: "waiting for locked resource '%{name}'"
-      gitartifact_container_loading: 'loading dappdeps/gitartifact container'
-      base_container_loading: 'loading dappdeps/base container'
-      chefdk_container_loading: 'loading dappdeps/chefdk container'
-      system_shellout_container_loading: 'loading system shellout container'
+      gitartifact_container_creating: 'creating dappdeps/gitartifact container'
+      base_container_creating: 'creating dappdeps/base container'
+      chefdk_container_creating: 'creating dappdeps/chefdk container'
+      system_shellout_container_starting: 'starting system-shellout container'
       image_pull: "pulling image '%{name}'"
       image_push: "pushing image '%{name}'"
     status:

data/lib/dapp.rb

@@ -13,6 +13,7 @@ require 'ostruct'
 require 'time'
 require 'i18n'
 require 'paint'
+require 'inifile'
 
 require 'net_status'
 
@@ -157,6 +158,7 @@ require 'dapp/dimg/git_artifact'
 require 'dapp/dimg/path'
 require 'dapp/dimg/tags'
 require 'dapp/dimg/stages'
+require 'dapp/dimg/system_shellout'
 require 'dapp/dimg'
 require 'dapp/artifact'
 require 'dapp/image/argument'

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

@@ -65,7 +65,7 @@ module Dapp
           docker_options = ['--rm',
                             "--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}"]
+                            "--entrypoint #{dimg.project.bash_bin}"]
           dimg.project.log_secondary_process(dimg.project.t(code: 'process.artifact_copy',
                                                             data: { name: artifact_name }),
                                              short: true,

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

@@ -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 " \
-            "#{dimg.project.find_path} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
-            "#{dimg.project.bash_path} -ec '#{dimg.project.install_path} -D #{credentials} {} " \
+            "#{dimg.project.find_bin} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
+            "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -D #{credentials} {} " \
             "#{File.join(to, '$(echo {} | ' \
-            "#{dimg.project.sed_path} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\; ;" \
+            "#{dimg.project.sed_bin} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\; ;" \
             'fi'
           end
 
           commands = []
-          commands << [dimg.project.install_path, credentials, '-d', to].join(' ')
+          commands << [dimg.project.install_bin, 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 << "#{dimg.project.find_bin} #{to} -type d -exec " \
+                      "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -d #{credentials} {}' \\;"
           commands.join(' && ')
         end
         # rubocop:enable Metrics/ParameterLists, Metrics/AbcSize, Metrics/MethodLength

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

@@ -57,7 +57,7 @@ module Dapp
                           end
           include_paths.map! { |path| path[1..-1] } # relative path
 
-          command = "#{sudo} #{dimg.project.tar_path} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"
+          command = "#{sudo} #{dimg.project.tar_bin} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"
           run_artifact_dimg(artifact_dimg, artifact_name, command)
 
           image.add_archive archive_path

data/lib/dapp/builder/chef.rb

@@ -40,8 +40,8 @@ module Dapp
       def chef_cookbooks(image)
         image.add_volume "#{cookbooks_vendor_path(chef_cookbooks_stage: true)}:#{dimg.container_dapp_path('chef_cookbooks')}"
         image.add_command(
-          "#{dimg.project.mkdir_path} -p /usr/share/dapp/chef_repo",
-          ["#{dimg.project.cp_path} -a #{dimg.container_dapp_path('chef_cookbooks')} ",
+          "#{dimg.project.mkdir_bin} -p /usr/share/dapp/chef_repo",
+          ["#{dimg.project.cp_bin} -a #{dimg.container_dapp_path('chef_cookbooks')} ",
            '/usr/share/dapp/chef_repo/cookbooks'].join
         )
       end
@@ -208,7 +208,7 @@ module Dapp
       def chefdk_container
         @chefdk_container ||= begin
           if dimg.project.shellout("docker inspect #{chefdk_container_name}").exitstatus.nonzero?
-            dimg.project.log_secondary_process(dimg.project.t(code: 'process.chefdk_container_loading'), short: true) do
+            dimg.project.log_secondary_process(dimg.project.t(code: 'process.chefdk_container_creating'), short: true) do
               dimg.project.shellout!(
                 ['docker create',
                  "--name #{chefdk_container_name}",
@@ -253,13 +253,13 @@ module Dapp
           after_vendor_commands = [].tap do |commands|
             if dimg.project.dev_mode?
               commands.push(
-                ["#{dimg.project.install_path} -o #{Process.uid} -g #{Process.gid} ",
-                 "--mode $(#{dimg.project.stat_path} -c %a Berksfile.lock) ",
+                ["#{dimg.project.install_bin} -o #{Process.uid} -g #{Process.gid} ",
+                 "--mode $(#{dimg.project.stat_bin} -c %a Berksfile.lock) ",
                  "Berksfile.lock #{berksfile_lock_path}"].join
               )
             elsif !chef_cookbooks_stage
               commands.push(
-                "export LOCKDIFF=$(#{dimg.project.diff_path} -u1 #{berksfile_lock_path} Berksfile.lock)",
+                "export LOCKDIFF=$(#{dimg.project.diff_bin} -u1 #{berksfile_lock_path} Berksfile.lock)",
                 ['if [ "$LOCKDIFF" != "" ] ; then ',
                  "echo -e \"",
                  "Bad Berksfile.lock, run '#{_update_berksfile_lock_cmd}' ",
@@ -271,14 +271,14 @@ module Dapp
           end
 
           vendor_commands = [
-            "#{dimg.project.mkdir_path} -p ~/.ssh",
+            "#{dimg.project.mkdir_bin} -p ~/.ssh",
             "echo \"Host *\" >> ~/.ssh/config",
             "echo \"    StrictHostKeyChecking no\" >> ~/.ssh/config",
             *berksfile
               .local_cookbooks
               .values
               .map {|cookbook|
-                ["#{dimg.project.rsync_path} --archive",
+                ["#{dimg.project.rsync_bin} --archive",
                  #*cookbook[:chefignore].map {|path| "--exclude #{path}"}, # FIXME
                  "--relative #{cookbook[:path]} /tmp/local_cookbooks",
                 ].join(' ')
@@ -287,13 +287,13 @@ module Dapp
             *before_vendor_commands,
             '/.dapp/deps/chefdk/bin/berks vendor /tmp/cookbooks',
             *after_vendor_commands,
-            ["#{dimg.project.find_path} /tmp/cookbooks -type d -exec #{dimg.project.bash_path} -ec '",
-             "#{dimg.project.install_path} -o #{Process.uid} -g #{Process.gid} --mode $(#{dimg.project.stat_path} -c %a {}) -d ",
-             "#{dest_path}/$(echo {} | #{dimg.project.sed_path} -e \"s/^\\/tmp\\/cookbooks//\")' \\;"].join,
-            ["#{dimg.project.find_path} /tmp/cookbooks -type f -exec #{dimg.project.bash_path} -ec '",
-             "#{dimg.project.install_path} -o #{Process.uid} -g #{Process.gid} --mode $(#{dimg.project.stat_path} -c %a {}) {} ",
-             "#{dest_path}/$(echo {} | #{dimg.project.sed_path} -e \"s/\\/tmp\\/cookbooks//\")' \\;"].join,
-            "#{dimg.project.install_path} -o #{Process.uid} -g #{Process.gid} --mode 0644 <(#{dimg.project.date_path} +%s.%N) #{dest_path.join('.created_at')}"
+            ["#{dimg.project.find_bin} /tmp/cookbooks -type d -exec #{dimg.project.bash_bin} -ec '",
+             "#{dimg.project.install_bin} -o #{Process.uid} -g #{Process.gid} --mode $(#{dimg.project.stat_bin} -c %a {}) -d ",
+             "#{dest_path}/$(echo {} | #{dimg.project.sed_bin} -e \"s/^\\/tmp\\/cookbooks//\")' \\;"].join,
+            ["#{dimg.project.find_bin} /tmp/cookbooks -type f -exec #{dimg.project.bash_bin} -ec '",
+             "#{dimg.project.install_bin} -o #{Process.uid} -g #{Process.gid} --mode $(#{dimg.project.stat_bin} -c %a {}) {} ",
+             "#{dest_path}/$(echo {} | #{dimg.project.sed_bin} -e \"s/\\/tmp\\/cookbooks//\")' \\;"].join,
+            "#{dimg.project.install_bin} -o #{Process.uid} -g #{Process.gid} --mode 0644 <(#{dimg.project.date_bin} +%s.%N) #{dest_path.join('.created_at')}"
           ]
 
           dimg.project.shellout!(
@@ -307,7 +307,7 @@ module Dapp
              "--volume #{dest_path.tap(&:mkpath)}:#{dest_path}",
              ('--env SSH_AUTH_SOCK=/tmp/dapp-ssh-agent' if dimg.project.ssh_auth_sock),
              ('--env DAPP_CHEF_COOKBOOKS_VENDORING=1' if chef_cookbooks_stage),
-             "dappdeps/berksdeps:0.1.0 #{dimg.project.bash_path} -ec '#{dimg.project.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
+             "dappdeps/berksdeps:0.1.0 #{dimg.project.bash_bin} -ec '#{dimg.project.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
             log_verbose: dimg.project.log_verbose?
           )
         end

data/lib/dapp/dimg.rb

@@ -5,6 +5,7 @@ module Dapp
     include Path
     include Tags
     include Stages
+    include SystemShellout
 
     include Helper::Sha256
 
@@ -148,7 +149,7 @@ module Dapp
     end
 
     def introspect_image!(image:, options:)
-      cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{options} #{image}"
+      cmd = "docker run -ti --rm --entrypoint #{project.bash_bin} #{options} #{image}"
       system(cmd)
     end
 

data/lib/dapp/dimg/system_shellout.rb

@@ -0,0 +1,17 @@
+module Dapp
+  # Dimg
+  class Dimg
+    # SystemShellout
+    module SystemShellout
+      def system_shellout(command, **kwargs)
+        project.system_shellout_extra(volume: tmp_path) do
+          project.system_shellout(command, **kwargs)
+        end
+      end
+
+      def system_shellout!(command, **kwargs)
+        system_shellout(command, raise_error: true, **kwargs)
+      end
+    end # SystemShellout
+  end # Dimg
+end # Dapp

data/lib/dapp/git_artifact.rb

@@ -26,9 +26,9 @@ module Dapp
     def apply_archive_command(stage)
       credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
 
-      ["#{repo.dimg.project.install_path} #{credentials.join(' ')} -d #{to}",
-       ["#{repo.dimg.project.git_path} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{include_paths.join(' ')}",
-        "#{sudo}#{repo.dimg.project.tar_path} -x -C #{to} #{archive_command_excludes.join(' ')}"].join(' | ')]
+      ["#{repo.dimg.project.install_bin} #{credentials.join(' ')} -d #{to}",
+       ["#{repo.dimg.project.git_bin} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{include_paths.join(' ')}",
+        "#{sudo}#{repo.dimg.project.tar_bin} -x -C #{to} #{archive_command_excludes.join(' ')}"].join(' | ')]
     end
 
     def apply_patch_command(stage)
@@ -36,8 +36,8 @@ module Dapp
       prev_commit = stage.prev_g_a_stage.layer_commit(self)
 
       if prev_commit != current_commit || any_changes?(prev_commit, current_commit)
-        [["#{repo.dimg.project.git_path} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
-          "#{sudo}#{repo.dimg.project.git_path} apply --whitespace=nowarn --directory=#{to} #{patch_command_excludes.join(' ')} --unsafe-paths"].join(' | ')]
+        [["#{repo.dimg.project.git_bin} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
+          "#{sudo}#{repo.dimg.project.git_bin} apply --whitespace=nowarn --directory=#{to} #{patch_command_excludes.join(' ')} --unsafe-paths"].join(' | ')]
       else
         []
       end

data/lib/dapp/git_repo/base.rb

@@ -44,7 +44,7 @@ module Dapp
       protected
 
       def git(command, **kwargs)
-        dimg.project.system_shellout! "#{dimg.project.git_path} #{command}", **kwargs
+        dimg.system_shellout! "#{dimg.project.git_bin} #{command}", **kwargs
       end
     end
   end

data/lib/dapp/helper/trivia.rb

@@ -15,6 +15,16 @@ module Dapp
         path.delete if path.exist?
       end
 
+      def search_file_upward(filename)
+        cdir = Pathname(work_dir)
+        loop do
+          if (path = cdir.join(filename)).exist?
+            return path.to_s
+          end
+          break if (cdir = cdir.parent).root?
+        end
+      end
+
       def self.class_to_lowercase(class_name = self.class)
         class_name.to_s.split('::').last.split(/(?=[[:upper:]]|[0-9])/).join('_').downcase.to_s
       end

data/lib/dapp/image/argument.rb

@@ -110,7 +110,7 @@ module Dapp
       end
 
       def service_options
-        { entrypoint: project.bash_path, name: container_name }
+        { entrypoint: project.bash_bin, name: container_name }
       end
 
       def prepared_change
@@ -126,7 +126,7 @@ module Dapp
       end
 
       def prepared_commands
-        return [project.true_path] if bash_commands.empty?
+        return [project.true_bin] if bash_commands.empty?
         bash_commands
       end
     end

data/lib/dapp/image/scratch.rb

@@ -14,10 +14,11 @@ module Dapp
 
       def build!(**_kwargs)
         build_from_command = if from_archives.empty?
-                               "#{project.tar_path} c --files-from /dev/null"
+                               "#{project.tar_bin} c --files-from /dev/null"
                              else
-                               "#{project.cat_path} #{from_archives.join(' ')}"
+                               "#{project.cat_bin} #{from_archives.join(' ')}"
                              end
+        #FIXME: do not use docker import from system-shellout
         @built_id = project.system_shellout!("#{build_from_command} | docker import #{prepared_change} - ").stdout.strip
       end
 

data/lib/dapp/project.rb

@@ -51,18 +51,35 @@ module Dapp
 
     def name
       @name ||= begin
-        if File.exist? File.join(path, '.git')
-          begin
-            system_shellout("#{git_path} -C #{path} config --get remote.origin.url").stdout.strip.split('/').last[/.*(?=.git)/]
-          rescue
-            File.basename(path)
-          end
+        if git_url
+          repo_name = git_url.split('/').last
+          repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
+          repo_name
+        elsif git_path
+          File.basename(File.dirname(git_path))
         else
           File.basename(path)
         end
       end
     end
 
+    def git_url
+      return unless git_config
+      (git_config['remote "origin"'] || {})['url']
+    end
+
+    def git_config
+      @git_config ||= begin
+        IniFile.load(File.join(git_path, 'config')) if git_path
+      end
+    end
+
+    def git_path
+      defined?(@git_path) ? @git_path : begin
+        @git_path = search_file_upward('.git')
+      end
+    end
+
     def path
       @path ||= expand_path(dappfile_path)
     end

data/lib/dapp/project/dappfile.rb

@@ -12,20 +12,10 @@ module Dapp
       end
 
       def dappfile_path
-        raise Error::Project, code: :dappfile_not_found unless (dappfile_path = search_up('Dappfile'))
+        raise Error::Project, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
         dappfile_path
       end
 
-      def search_up(file)
-        cdir = Pathname(work_dir)
-        loop do
-          if (path = cdir.join(file)).exist?
-            return path.to_s
-          end
-          break if (cdir = cdir.parent).root?
-        end
-      end
-
       def work_dir
         File.expand_path(cli_options[:dir] || Dir.pwd)
       end

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

@@ -14,7 +14,7 @@ module Dapp
         def base_container
           @base_container ||= begin
             if shellout("docker inspect #{base_container_name}").exitstatus.nonzero?
-              log_secondary_process(t(code: 'process.base_container_loading'), short: true) do
+              log_secondary_process(t(code: 'process.base_container_creating'), short: true) do
                 shellout!(
                   ['docker create',
                    "--name #{base_container_name}",
@@ -26,17 +26,17 @@ module Dapp
           end
         end
 
-        %w(rsync diff date echo cat
+        %w(rsync diff date cat
            stat sleep mkdir find
            install sed cp true
            bash tar sudo).each do |cmd|
-          define_method("#{cmd}_path") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }
+          define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }
         end
 
         def sudo_command(owner: nil, group: nil)
           sudo = ''
           if owner || group
-            sudo = "#{sudo_path} -E "
+            sudo = "#{sudo_bin} -E "
             sudo += "-u #{sudo_format_user(owner)} " if owner
             sudo += "-g #{sudo_format_user(group)} " if group
           end

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

@@ -14,7 +14,7 @@ module Dapp
         def gitartifact_container
           @gitartifact_container ||= begin
             if shellout("docker inspect #{gitartifact_container_name}").exitstatus.nonzero?
-              log_secondary_process(t(code: 'process.gitartifact_container_loading'), short: true) do
+              log_secondary_process(t(code: 'process.gitartifact_container_creating'), short: true) do
                 shellout!(
                   ['docker create',
                    "--name #{gitartifact_container_name}",
@@ -27,7 +27,7 @@ module Dapp
           end
         end
 
-        def git_path
+        def git_bin
           "/.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}/bin/git"
         end
       end # Gitartifact

data/lib/dapp/project/system_shellout.rb

@@ -2,63 +2,15 @@ module Dapp
   # Project
   class Project
     module SystemShellout
-      SYSTEM_SHELLOUT_IMAGE = 'ubuntu:14.04'.freeze
-      SYSTEM_SHELLOUT_VERSION = 3
-
-      def system_shellout_container_name
-        "dapp_system_shellout_#{hashsum [SYSTEM_SHELLOUT_VERSION,
-                                         SYSTEM_SHELLOUT_IMAGE,
-                                         Deps::Base::BASE_VERSION,
-                                         Deps::Gitartifact::GITARTIFACT_VERSION]}"
-      end
-
-      def system_shellout_container
-        do_livecheck = false
-
-        @system_shellout_container ||= begin
-          lock(system_shellout_container_name) do
-            cmd = shellout("docker inspect -f {{.State.Running}} #{system_shellout_container_name}")
-            if cmd.exitstatus.nonzero?
-              start_container = true
-            elsif cmd.stdout.strip == 'false'
-              shellout!("docker rm -f #{system_shellout_container_name}")
-              start_container = true
-            else
-              start_container = false
-            end
-
-            if start_container
-              volumes_from = [base_container, gitartifact_container]
-              log_secondary_process(t(code: 'process.system_shellout_container_loading'), short: true) do
-                shellout! ['docker run --detach --privileged',
-                           "--name #{system_shellout_container_name}",
-                           *volumes_from.map { |container| "--volumes-from #{container}" },
-                           '--volume /:/.system_shellout_root',
-                           "#{SYSTEM_SHELLOUT_IMAGE} #{bash_path} -ec 'while true ; do sleep 1 ; done'"].join(' ')
-
-                shellout! ["docker exec #{system_shellout_container_name}",
-                           "bash -ec '#{[
-                             'mkdir -p /.system_shellout_root/.dapp',
-                             'mount --rbind /.dapp /.system_shellout_root/.dapp'
-                           ].join(' && ')}'"].join(' ')
-              end
-            end
-          end
-
-          do_livecheck = true
-          system_shellout_container_name
-        end
-
-        system_shellout_livecheck! if do_livecheck
-
-        @system_shellout_container
-      end
+      SYSTEM_SHELLOUT_IMAGE = 'ubuntu:16.04'.freeze
 
       def system_shellout(command, raise_error: false, **kwargs)
-        if raise_error
-          shellout! _to_system_shellout_command(command), **kwargs
-        else
-          shellout _to_system_shellout_command(command), **kwargs
+        system_shellout_extra(volume: (git_path ? File.dirname(git_path) : path)) do
+          if raise_error
+            shellout! _to_system_shellout_command(command), **kwargs
+          else
+            shellout _to_system_shellout_command(command), **kwargs
+          end
         end
       end
 
@@ -66,26 +18,38 @@ module Dapp
         system_shellout(command, raise_error: true, **kwargs)
       end
 
-      private
+      def system_shellout_extra(volume: [], workdir: nil, &blk)
+        old = system_shellout_opts.dup
+
+        system_shellout_opts[:volume] += Array(volume)
+        system_shellout_opts[:workdir] = workdir if workdir
+
+        yield if block_given?
+      ensure
+        @system_shellout_opts = old
+      end
+
+      protected
 
-      def system_shellout_livecheck!
-        # This is stupid container "live check" for now
-        system_shellout! 'true'
-      rescue Error::Shellout
-        $stderr.puts "\033[1m\033[31mSystem shellout container failure, " \
-                     'try to remove if error persists: ' \
-                     "docker rm -f #{system_shellout_container_name}\033[0m"
-        raise
+      def system_shellout_opts
+        @system_shellout_opts ||= {volume: []}
       end
 
       def _to_system_shellout_command(command)
-        cmd = shellout_pack ["cd #{Dir.pwd}", command].join(' && ')
-        "docker exec #{system_shellout_container} chroot /.system_shellout_root #{bash_path} -ec '#{[
-          *SystemShellout.default_env_keys.map do |env_key|
-            env_key = env_key.to_s.upcase
-            "export #{env_key}=#{ENV[env_key]}"
-          end, cmd
-        ].join(' && ')}'"
+        volumes_from = [base_container, gitartifact_container]
+
+        ['docker run',
+         '--rm',
+         "--workdir #{system_shellout_opts[:workdir] || Dir.pwd}",
+         *volumes_from.map { |container| "--volumes-from #{container}" },
+         *Array(system_shellout_opts[:volume]).map { |volume| "--volume #{volume}:#{volume}" },
+         *SystemShellout.default_env_keys.map { |env_key|
+           env_key = env_key.to_s.upcase
+           "--env #{env_key}=#{ENV[env_key]}"
+         },
+         SYSTEM_SHELLOUT_IMAGE,
+         "#{bash_bin} -ec '#{shellout_pack(command)}'"
+        ].join(' ')
       end
 
       class << self

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.11'.freeze
+  VERSION = '0.7.12'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -124,6 +124,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -431,6 +445,7 @@ files:
 - lib/dapp/dimg/git_artifact.rb
 - lib/dapp/dimg/path.rb
 - lib/dapp/dimg/stages.rb
+- lib/dapp/dimg/system_shellout.rb
 - lib/dapp/dimg/tags.rb
 - lib/dapp/docker_registry.rb
 - lib/dapp/docker_registry/base.rb