dapp 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a9ec9afc7917a8ecf1ba8d47e65defef16df8f
-  data.tar.gz: 50c22e22781a24115fc79514ad9c71410784a75e
+  metadata.gz: 442f21d5a2d84a60587d83bf4e3578622d079c17
+  data.tar.gz: f63c5c35c355eca4929c7a3f7fe1670d4f12fb16
 SHA512:
-  metadata.gz: 919231c2f8a6f6bf78780bcf969921472ddd416dee45fc46404cb9ff84f22848c780e8a76b342aa34d1024986fa651dd19e38d496328caa8610b297ac56d4c80
-  data.tar.gz: 929a790d85767cc510136ed9283b6ec86cb473e18cdee69fec205b0277dba81a11952930edf0e6ac28e0d725359156c76a7fea3d390e8b61a51bf02c550575aa
+  metadata.gz: c56953614a510d5e1124080719375ac5c31545ad660f36749050f37918f7bdc3d90791e44b0a171f9099b7d1fc5723dd85a32814d85a47a87d9bae7b8ad8bbe7
+  data.tar.gz: d6c837e5d2d90544195a03f32c03a76167e23fab91c3f6bd803534987443ccaca06da497627ae6c96be3248a26aef127eff7bbeaa79353203e694b3a8bd3b0ce

data/config/en/common.yml

@@ -10,11 +10,12 @@ en:
     process:
       artifact_copy: "copying artifact '%{name}'"
       artifact_building: "building 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'
+      gitartifact_container_loading: 'loading dappdeps/gitartifact container'
+      chefdk_container_loading: 'loading dappdeps/chefdk container'
+      system_shellout_container_loading: 'loading system shellout container'
     status:
       process:
         pushing: '[PUSHING]'
@@ -29,4 +30,4 @@ en:
       not_present: '[NOT PRESENT]'
       build: '[BUILD]'
       empty: '[EMPTY]'
-      push: '[PUSH]'
+      push: '[PUSH]'

data/lib/dapp.rb

@@ -85,6 +85,8 @@ require 'dapp/application/git_artifact'
 require 'dapp/application/logging'
 require 'dapp/application/path'
 require 'dapp/application/tags'
+require 'dapp/application/deps/gitartifact'
+require 'dapp/application/system_shellout'
 require 'dapp/application'
 require 'dapp/image/argument'
 require 'dapp/image/docker'

data/lib/dapp/application.rb

@@ -9,6 +9,8 @@ module Dapp
     include GitArtifact
     include Path
     include Tags
+    include Deps::Gitartifact
+    include SystemShellout
     include Dapp::Filelock
 
     attr_reader :config

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

@@ -0,0 +1,39 @@
+module Dapp
+  # Application
+  class Application
+    # Deps
+    module Deps
+      # Gitartifact
+      module Gitartifact
+        GITARTIFACT_IMAGE = 'dappdeps/gitartifact:0.1.5'.freeze
+
+        def gitartifact_container_name # FIXME: hashsum(image) or dockersafe()
+          GITARTIFACT_IMAGE.tr('/', '_').tr(':', '_')
+        end
+
+        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
+                shellout ['docker run',
+                          '--restart=no',
+                          "--name #{gitartifact_container_name}",
+                          "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}",
+                          '2>/dev/null'].join(' ')
+              end
+            end
+            gitartifact_container_name
+          end
+        end
+
+        def git_path
+          '/.dapp/deps/gitartifact/bin/git'
+        end
+
+        def sudo_path
+          '/.dapp/deps/gitartifact/bin/sudo'
+        end
+      end # Gitartifact
+    end # Deps
+  end # Application
+end # Dapp

data/lib/dapp/application/system_shellout.rb

@@ -0,0 +1,57 @@
+module Dapp
+  # Application
+  class Application
+    # SystemShellout
+    module SystemShellout
+      SYSTEM_SHELLOUT_IMAGE = 'ubuntu:14.04'
+      SYSTEM_SHELLOUT_VERSION = 2
+
+      def system_shellout_container_name
+        "dapp_system_shellout_#{hashsum [SYSTEM_SHELLOUT_VERSION,
+                                         SYSTEM_SHELLOUT_IMAGE,
+                                         Deps::Gitartifact::GITARTIFACT_IMAGE]}"
+      end
+
+      def system_shellout_container
+        @system_shellout_container ||= begin
+          if shellout("docker inspect #{system_shellout_container_name}").exitstatus.nonzero?
+            volumes_from = [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 -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',
+                           'mount --rbind /usr/bin /.system_shellout_root/usr/bin',
+                           'apt-get update -qq',
+                           'apt-get install -qq openssh-client',
+                         ].join(' && ')}'"].join(' ')
+            end
+          end
+
+          system_shellout_container_name
+        end
+      end
+
+      def system_shellout(command, **kwargs)
+        shellout _to_system_shellout_command(command), **kwargs
+      end
+
+      def system_shellout!(command, **kwargs)
+        shellout! _to_system_shellout_command(command), **kwargs
+      end
+
+      private
+
+      def _to_system_shellout_command(command)
+        cmd = shellout_pack ["cd #{Dir.pwd}", command].join(' && ')
+        "docker exec #{system_shellout_container} chroot /.system_shellout_root bash -ec '#{cmd}'"
+      end
+    end # SystemShellout
+  end # Application
+end # Dapp

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

@@ -5,8 +5,6 @@ module Dapp
       class SourceBase < Base
         attr_accessor :prev_source_stage, :next_source_stage
 
-        GITARTIFACT_IMAGE = 'dappdeps/gitartifact:0.1.5'.freeze
-
         def prev_source_stage
           dependencies_stage.prev_stage.prev_stage
         end
@@ -21,7 +19,7 @@ module Dapp
 
         def image
           super do |image|
-            image.add_volumes_from gitartifact_container
+            image.add_volumes_from application.gitartifact_container
             application.git_artifacts.each do |git_artifact|
               image.add_volume "#{git_artifact.repo.path}:#{git_artifact.repo.container_path}:ro"
               image.add_command git_artifact.send(apply_command_method, self)
@@ -44,31 +42,8 @@ module Dapp
           end
         end
 
-        def git_dappdeps_path
-          '/.dapp/deps/gitartifact/bin/git'
-        end
-
         protected
 
-        def gitartifact_container_name # FIXME: hashsum(image) or dockersafe()
-          GITARTIFACT_IMAGE.tr('/', '_').tr(':', '_')
-        end
-
-        def gitartifact_container
-          @gitartifact_container ||= begin
-            if application.shellout("docker inspect #{gitartifact_container_name}").exitstatus.nonzero?
-              application.log_secondary_process(application.t(code: 'process.git_artifact_loading'), short: true) do
-                application.shellout ['docker run',
-                                      '--restart=no',
-                                      "--name #{gitartifact_container_name}",
-                                      "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}",
-                                      '2>/dev/null'].join(' ')
-              end
-            end
-            gitartifact_container_name
-          end
-        end
-
         def should_not_be_detailed?
           true
         end

data/lib/dapp/builder/chef.rb

@@ -22,7 +22,7 @@ module Dapp
             image.add_command "export DAPP_BUILD_STAGE=#{stage}"
 
             image.add_volume "#{stage_build_path(stage)}:#{container_stage_build_path(stage)}:ro"
-            image.add_command [chef_solo_dappdeps_path,
+            image.add_command ['/.dapp/deps/chefdk/bin/chef-solo',
                                '--legacy-mode',
                                "-c #{container_stage_config_path(stage)}",
                                "-o #{stage_cookbooks_runlist(stage).join(',')}"].join(' ')
@@ -139,7 +139,7 @@ module Dapp
       def chefdk_container
         @chefdk_container ||= begin
           if application.shellout("docker inspect #{chefdk_container_name}").exitstatus.nonzero?
-            application.log_secondary_process(application.t(code: 'process.chefdk_loading'), short: true) do
+            application.log_secondary_process(application.t(code: 'process.chefdk_container_loading'), short: true) do
               application.shellout(
                 ['docker run',
                  '--restart=no',
@@ -166,7 +166,7 @@ module Dapp
             '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',
-            "#{berks_dappdeps_path} vendor /tmp/vendored_cookbooks",
+            "/.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 ; ',
@@ -381,14 +381,6 @@ module Dapp
       def container_stage_build_path(_stage, *path)
         path.compact.map(&:to_s).inject(Pathname.new('/.dapp/chef/build'), &:+)
       end
-
-      def chef_solo_dappdeps_path
-        '/.dapp/deps/chefdk/bin/chef-solo'
-      end
-
-      def berks_dappdeps_path
-        '/.dapp/deps/chefdk/bin/berks'
-      end
     end
   end
 end

data/lib/dapp/git_artifact.rb

@@ -27,7 +27,7 @@ module Dapp
       credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
 
       ["install #{credentials.join(' ')} -d #{where_to_add}",
-       ["#{stage.git_dappdeps_path} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{paths}",
+       ["#{repo.application.git_path} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{paths}",
         "#{sudo}tar -x -C #{where_to_add}"].join(' | ')]
     end
 
@@ -36,8 +36,8 @@ module Dapp
       prev_commit = stage.prev_source_stage.layer_commit(self)
 
       if prev_commit != current_commit || any_changes?(prev_commit, current_commit)
-        [["#{stage.git_dappdeps_path} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
-          "#{sudo}#{stage.git_dappdeps_path} apply --whitespace=nowarn --directory=#{where_to_add} --unsafe-paths"].join(' | ')]
+        [["#{repo.application.git_path} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
+          "#{sudo}#{repo.application.git_path} apply --whitespace=nowarn --directory=#{where_to_add} --unsafe-paths"].join(' | ')]
       else
         []
       end
@@ -84,7 +84,7 @@ module Dapp
       sudo = ''
 
       if owner || group
-        sudo = 'sudo -E '
+        sudo = "#{repo.application.sudo_path} -E "
         sudo += "-u #{sudo_format_user(owner)} " if owner
         sudo += "-g #{sudo_format_user(group)} " if group
       end

data/lib/dapp/git_repo/base.rb

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

data/lib/dapp/git_repo/remote.rb

@@ -52,7 +52,8 @@ module Dapp
 
       def git(command, **kwargs)
         if use_ssh_key && ssh_key_path
-          application.shellout!("ssh-agent bash -ec 'ssh-add #{ssh_key_path}; git #{command}'", **kwargs)
+          cmd = application.shellout_pack("/usr/bin/ssh-agent bash -ec '/usr/bin/ssh-add #{ssh_key_path}; #{application.git_path} #{command}'")
+          application.system_shellout!("bash -ec '#{cmd}'")
         else
           super
         end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.5.8'.freeze
+  VERSION = '0.5.9'.freeze
   BUILD_CACHE_VERSION = 3
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -327,9 +327,11 @@ files:
 - config/en/net_status.yml
 - lib/dapp.rb
 - lib/dapp/application.rb
+- lib/dapp/application/deps/gitartifact.rb
 - lib/dapp/application/git_artifact.rb
 - lib/dapp/application/logging.rb
 - lib/dapp/application/path.rb
+- lib/dapp/application/system_shellout.rb
 - lib/dapp/application/tags.rb
 - lib/dapp/build/stage/artifact.rb
 - lib/dapp/build/stage/base.rb