dapp 0.26.4 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9e8f8d2fa7f410069b4b02556585308a99b85d
-  data.tar.gz: f05375ed044a0c9f84c8acb2ea404c1c656f65e0
+  metadata.gz: ccf825a07836692f74d5cc646cd70097b4523df2
+  data.tar.gz: 7eeec05c6467aae9a5c93efcdab6e19fedec36e9
 SHA512:
-  metadata.gz: 0566a3ba461e2aef89f22ece6e86bb1cb19f1e6cb6cd8d53681b75b5f6d923d0afccc33ac04d0f66a52752135b6449fe30b9d16c7b6e08d647643b037aa82516
-  data.tar.gz: 89583da2b9c6844710ba58ac285662265e5b8b1b686fd3b4b36a19e27821d32e0ef99ad6473a2c43a79de424d0cc6cf434d6389244509e9081695348e854143a
+  metadata.gz: d61986ed6e35c8861cf2f503dd9db4abe534ea5a48ee8665598b1f9ec85c2ae7a72b0391c9b06aa8fc19583eadbf2d50add9b33f9392d673285b27c01b72e649
+  data.tar.gz: 8a6c2d8e70fc68ffcbf0e93d97741741952988e72ea4f24f2ccc6565d5bf110671796f1f7b9f341483928e8aaaf005b2cf838dde3bf69e73e584f1067f87ed47

data/config/en/common.yml

@@ -21,6 +21,7 @@ en:
       toolchain_container_creating: 'creating dappdeps/toolchain container `%{name}`'
       base_container_creating: 'creating dappdeps/base container `%{name}`'
       chefdk_container_creating: 'creating dappdeps/chefdk container `%{name}`'
+      ansible_container_creating: 'creating dappdeps/ansible container `%{name}`'
       image_pull: "pulling image `%{name}`"
       image_push: "pushing image `%{name}`"
       image_save: "saving image `%{name}`"

data/lib/dapp.rb

@@ -135,6 +135,7 @@ require 'dapp/dimg/builder/chef/cookbook_metadata'
 require 'dapp/dimg/builder/chef/berksfile'
 require 'dapp/dimg/builder/chef/cookbook'
 require 'dapp/dimg/builder/shell'
+require 'dapp/dimg/builder/ansible'
 require 'dapp/dimg/builder/none'
 require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'

data/lib/dapp/dapp.rb

@@ -140,13 +140,14 @@ module Dapp
 
     def try_host_docker_login
       return unless option_repo
-
       validate_repo_name!(option_repo)
+      host_docker_login(option_repo)
+    end
 
-      if self.class.options_with_docker_credentials?
-        username, password = self.class.docker_credentials
-        shellout!("#{host_docker} login -u '#{username}' -p '#{password}' '#{option_repo}'")
-      end
+    def host_docker_login(repo)
+      return unless self.class.options_with_docker_credentials?
+      username, password = self.class.docker_credentials
+      shellout!("#{host_docker} login -u '#{username}' -p '#{password}' '#{repo}'")
     end
 
     class << self

data/lib/dapp/dimg/build/stage/from.rb

@@ -10,12 +10,22 @@ module Dapp
           protected
 
           def prepare_image
+            try_host_docker_login
             from_image.pull!
             raise Error::Build, code: :from_image_not_found, data: { name: from_image_name } unless from_image.tagged?
             add_cleanup_mounts_dirs_command
             super
           end
 
+          def try_host_docker_login
+            return unless registry_from_image_name?
+            dimg.dapp.host_docker_login(ENV['CI_REGISTRY'])
+          end
+
+          def registry_from_image_name?
+            ENV['CI_REGISTRY'] && from_image_name.start_with?(ENV['CI_REGISTRY'])
+          end
+
           def add_cleanup_mounts_dirs_command
             return if config_mounts_dirs.empty?
             image.add_service_command ["#{dimg.dapp.rm_bin} -rf %s",

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

@@ -0,0 +1,40 @@
+module Dapp
+  module Dimg
+    class Builder::Ansible < Builder::Base
+      ANSIBLE_IMAGE_VERSION = "2.4.1.0-1"
+
+      def ansible_bin
+        "/.dapp/deps/ansible/#{ANSIBLE_IMAGE_VERSION}/bin/ansible"
+      end
+
+      def ansible_image
+        "dappdeps/ansible:#{ANSIBLE_IMAGE_VERSION}"
+      end
+
+      def ansible_container_name
+        "dappdeps_ansible_#{ANSIBLE_IMAGE_VERSION}"
+      end
+
+      def ansible_container
+        @ansible_container ||= begin
+          is_container_exist = proc{dimg.dapp.shellout("#{dimg.dapp.host_docker} inspect #{ansible_container_name}").exitstatus.zero?}
+          if !is_container_exist.call
+            dimg.dapp.lock("dappdeps.container.#{ansible_container_name}", default_timeout: 600) do
+              if !is_container_exist.call
+                dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.ansible_container_creating', data: {name: ansible_container_name}), short: true) do
+                  dimg.dapp.shellout!(
+                    ["#{dimg.dapp.host_docker} create",
+                     "--name #{ansible_container_name}",
+                     "--volume /.dapp/deps/ansible/#{ANSIBLE_IMAGE_VERSION} #{ansible_image}"].join(' ')
+                  )
+                end
+              end
+            end
+          end
+          ansible_container_name
+        end
+      end
+
+    end # Builder::Ansible
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/dimg/git_artifact.rb

@@ -32,6 +32,8 @@ module Dapp
           [].tap do |artifacts|
             artifacts << (artifact = ::Dapp::Dimg::GitArtifact.new(repo, self, **git_artifact_options))
             artifacts.concat(generate_git_embedded_artifacts(artifact))
+          end.select do |artifact|
+            !artifact.empty?
           end
         end
 

data/lib/dapp/dimg/git_artifact.rb

@@ -290,6 +290,10 @@ module Dapp
         any_changes?(*patch_stage_commits(stage))
       end
 
+      def empty?
+        repo_entries(latest_commit).empty?
+      end
+
       protected
 
       def hexdigest(*args)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.4"
+  VERSION = "0.26.5"
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -534,6 +534,7 @@ files:
 - lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch.rb
 - lib/dapp/dimg/build/stage/setup/setup.rb
 - lib/dapp/dimg/builder.rb
+- lib/dapp/dimg/builder/ansible.rb
 - lib/dapp/dimg/builder/base.rb
 - lib/dapp/dimg/builder/chef.rb
 - lib/dapp/dimg/builder/chef/berksfile.rb