dapp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNiYzk4ODg4ZWRlZjlmZWM1ZGVhNWU0MzYwZjA3N2FlZGE0OTU2Mg==
+    YzAxNjZmMWU3YzMyNTU5YjdkZmUxNmVhZDc2NGUxZjc2MWYzNTYwOQ==
   data.tar.gz: !binary |-
-    OTJlNGZlNWNmMTcwNzA4OTQ4MDE1Yjk5NTRkNDFhMjcyYmI5OWRiYQ==
+    NTQyN2ExNTg1MmE3YzM1YzMzMDQ3OGRlZDBlYmFjZGUwY2E0MTdiZQ==
 SHA512:
   metadata.gz: !binary |-
-    M2I0M2FjM2JkZjJmNzljMThlM2Y0M2UzYzhiNjk4YTQxMjRiMDExZTcwOGUx
-    ODRlNTk0NWM3MTM4NWUxM2E4ZjVlYmFjYzgyZTE2NTdiOGI5MTc4MDI2MDBl
-    OTUyODM0MTVkOTQ0ZmI1MzYyZmNiYmVkN2IzN2JmM2NiNDFhMjc=
+    ZjBmZTg0YzI2NzVmYWQ1NDg4NjdlOWQ4YWNmN2VjNTMzODdkNzMxMTFhYjk2
+    ZGMzOGUxYmI4ODY5NGM0NWY5MTY5YzQ2YTEyZTg4MzI2OGZkNmE0ZjI1NDA0
+    ZTkzOTQ4NzE3OGMyZWM4Yjg2ZWU2Nzg2MWZkNTVkNDhjNDNlYmU=
   data.tar.gz: !binary |-
-    YjRjNDc0MTllYmFmMGU4M2FlMGFjMWJkZDk5YWNmMDFmNmFhNWU4OTE5YzZi
-    YWU5YTFiMmU3MDg1ZGZlZjQ4NzdjODVlOGI0MDJkOWUwZjBlZDBiZDhkOGY3
-    YWE4ZWNjYjYwOGM1MmRmYjk0OTg3OGI5ODIzNmQ4YzI3ZWMxNjI=
+    ZTJiNDNmNTBiZDlmYWFlMWQxYmYxMmFkZTA2NGFlNTY1YTFjMTYyNDEyMWM5
+    YmIzYjA4NzVjOGE2YzQyZWI4Y2JiMzA5NzdjZjkyYzc2MzMyMjM3YTViZWVh
+    OGUzZjIxZTUwMzY0YTQ1N2Y2MDE4MGNlOWQzNzBhYWEzYzdjYzU=

data/lib/dapp/builder/chef.rb

@@ -168,18 +168,28 @@ module Dapp
         @install_cookbooks ||= begin
           volumes_from = chefdk_container
           application.log_secondary_process(application.t(code: 'process.berks_vendor')) do
+            ssh_auth_socket_path = nil
+            ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] and File.exist?(ENV['SSH_AUTH_SOCK'])
+
             application.shellout!(
               ['docker run --rm',
-               "--volumes-from #{volumes_from}",
+               '--volume /etc:/etc:ro',
+               '--volume /usr:/usr:ro',
+               '--volume /lib:/lib:ro',
+               '--volume /home:/home',
+               '--volume /tmp:/tmp',
+               ("--volume #{ssh_auth_socket_path.dirname}:#{ssh_auth_socket_path.dirname}" if ssh_auth_socket_path),
                "--volume #{cookbooks_vendor_path.tap(&:mkpath)}:#{cookbooks_vendor_path}",
                *berksfile.local_cookbooks
                          .values
                          .map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
+               "--volumes-from #{volumes_from}",
                "--user #{Process.uid}:#{Process.gid}",
                "--workdir #{berksfile_path.parent}",
                '--env BERKSHELF_PATH=/tmp/berkshelf',
+               ("--env SSH_AUTH_SOCK=#{ssh_auth_socket_path}" if ssh_auth_socket_path),
                "dappdeps/berksdeps:0.1.0 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"
-              ].join(' '),
+              ].compact.join(' '),
               log_verbose: application.log_verbose?
             )
 

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Stolyarov