dapp 0.2.6 → 0.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTIyNTY4OTdmNjMxOGJjYzE1NmI2ZmRhNGQ5ZmQ1YzAyNzQ1YWU3ZA==
+    NmY2NzQzN2JiYmQ0Y2M4ZmY0ZTEwMGMzYTI3ZmQ0ZDYyZjlkODJjMw==
   data.tar.gz: !binary |-
-    YWViZjQ0NjA5ZWNlYzYwMGQ5MDU2MDZjOGE3NTc5MDczNDFjNGNiMg==
+    OTYwNTYyN2M5MWQyNjkxZTNjMGYxZmNlZTk3NTFiM2RhOTVlMjA5ZA==
 SHA512:
   metadata.gz: !binary |-
-    MDRiOTcwMDRiZDc1YzNhZTQ5NDM0NzFkNTRiMzZmM2YyNGQ2ZjdkMWUyMjc1
-    OTY1ZDBjMGY2Y2VhMTkyMjhiOTIwMGRhYjE4YzU4YzgzYTlmODNhMzdkZWQ5
-    MGIyYzQ2NDI4MmI3MGEyYzU5MThlNTM5OWNlZGY5NDk3NDA3YzI=
+    NzBkNjBhZjljMTEzNDc0MDdjM2FmN2MxNmQ2YmViMGM5NmEzZDI2OTdhM2E2
+    MWIyYzE4NzQwMGFlMzQ1YzZjMDI0MTE5MjU2MWI1MzAzMTUxNTdjODAzYTlm
+    Yzc4YjlkNTA2YWI0M2VkODY2ZTAxNDAxZTYwMzJhMjcyZDRmODA=
   data.tar.gz: !binary |-
-    Njc0ZTllM2NjMjA1YjI0ZTY4NDU2Mjk1M2JlYWQzNjM3NWY1OTcxZTU5ODAz
-    MmM2NTQwOWQwMjk2ZDAwODY0ODVmYTYxYmE5YWU2MWMzMmYwYWMzOTIyZjE3
-    ZTg5YmM3NjgyYmYzOGU3NDJkOGNmNDIwYmQ4NmFlMGQxZmM0Y2Q=
+    NDU4ZWVjMmQyYWNmN2UyOGYxMjE1ODMzNDhlOWI2NDQ5ODljYjk4MmM1ODc5
+    OTFmZmM0ZWIzOWVmYzIyN2EzNTI3ZDg4Y2QwYWVkNjJjMzFlNTkwMzNiMzFj
+    ZjQ4YzM0ZWEyZDZlZjJlYjY5NTc1OTI2ZDQ0ZTBjNjlhODZjZmM=

data/lib/dapp.rb

@@ -53,6 +53,7 @@ require 'dapp/build/stage/infra_install'
 require 'dapp/build/stage/infra_setup'
 require 'dapp/build/stage/app_install'
 require 'dapp/build/stage/app_setup'
+require 'dapp/build/stage/chef_cookbooks'
 require 'dapp/build/stage/source_1_archive'
 require 'dapp/build/stage/source_1'
 require 'dapp/build/stage/source_2'

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

@@ -0,0 +1,23 @@
+module Dapp
+  module Build
+    module Stage
+      # ChefCookbooks
+      class ChefCookbooks < Base
+        def initialize(application, next_stage)
+          @prev_stage = AppSetup.new(application, self)
+          super
+        end
+
+        def signature
+          hashsum [prev_stage.signature, *application.builder.chef_cookbooks_checksum]
+        end
+
+        def image
+          super do |image|
+            application.builder.chef_cookbooks(image)
+          end
+        end
+      end # ChefCookbooks
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -6,10 +6,14 @@ module Dapp
         MAX_PATCH_SIZE = 1024 * 1024
 
         def initialize(application, next_stage)
-          @prev_stage = AppSetup.new(application, self)
+          @prev_stage = ChefCookbooks.new(application, self)
           super
         end
 
+        def prev_source_stage
+          prev_stage.prev_stage.prev_stage
+        end
+
         def next_source_stage
           next_stage
         end

data/lib/dapp/builder/chef.rb

@@ -12,11 +12,11 @@ module Dapp
         metadata.json
         recipes/%{stage}.rb
         recipes/*_%{stage}.rb
-        files/%{stage}/*
-        templates/%{stage}/*
+        files/default/%{stage}/*
+        templates/default/%{stage}/*
       ).freeze
 
-      DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.15.16-3'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
+      DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.17.3-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
 
       [:infra_install, :infra_setup, :app_install, :app_setup].each do |stage|
         define_method(:"#{stage}_checksum") { stage_cookbooks_checksum(stage) }
@@ -37,6 +37,17 @@ module Dapp
         end
       end
 
+      def chef_cookbooks_checksum
+        stage_cookbooks_checksum(:chef_cookbooks)
+      end
+
+      def chef_cookbooks(image)
+        image.add_commands(
+          "mkdir -p /usr/share/dapp/chef_repo",
+          "cp -a #{container_cookbooks_vendor_path} /usr/share/dapp/chef_repo/cookbooks"
+        )
+      end
+
       private
 
       def project_name
@@ -47,6 +58,10 @@ module Dapp
         application.home_path('Berksfile')
       end
 
+      def berksfile_lock_path
+        application.home_path('Berksfile.lock')
+      end
+
       def berksfile
         @berksfile ||= Berksfile.new(application.home_path, berksfile_path)
       end
@@ -60,8 +75,7 @@ module Dapp
       end
 
       def berksfile_lock_checksum
-        path = application.home_path('Berksfile.lock')
-        application.hashsum path.read if path.exist?
+        application.hashsum berksfile_lock_path.read if berksfile_lock_path.exist?
       end
 
       # rubocop:disable Metrics/AbcSize
@@ -78,9 +92,11 @@ module Dapp
             to_runlist_entrypoint[name, stage]
           end.compact)
 
-          res.concat(application.config._app_runlist.map(&:_name).map do |name|
-            subname_parts = name.split(project_name, 2)[1].split('-')
-            to_runlist_entrypoint[project_name, [*subname_parts, stage].join('_')]
+          project_main_entry = to_runlist_entrypoint[project_name, stage]
+          res << project_main_entry if project_main_entry
+
+          res.concat(application.config._app_runlist.map do |app_component|
+            to_runlist_entrypoint[project_name, [app_component, stage].join('_')]
           end.compact)
         end
       end
@@ -123,11 +139,18 @@ module Dapp
         else
           install_cookbooks
 
-          application.hashsum([_paths_checksum(stage_cookbooks_vendored_paths(stage, with_files: true)),
-                               *application.config._chef._modules,
-                               stage == :infra_install ? chefdk_image : nil].compact).tap do |checksum|
-            stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
+          if stage == :chef_cookbooks
+            checksum = cookbooks_checksum
+          else
+            checksum = application.hashsum [
+              _paths_checksum(stage_cookbooks_vendored_paths(stage, with_files: true)),
+              *application.config._chef._modules,
+              stage == :infra_install ? chefdk_image : nil
+            ].compact
           end
+
+          stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
+          checksum
         end
       end
 
@@ -172,24 +195,34 @@ module Dapp
             ssh_auth_socket_path = nil
             ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
 
+            vendor_commands = [
+              'mkdir -p ~/.ssh',
+              'echo "Host *" >> ~/.ssh/config',
+              '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',
+              '/.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 ; ',
+               'echo -e "Bad Berksfile.lock\n$LOCKDIFF" 1>&2 ; exit 1 ; fi'].join,
+              ["find /tmp/vendored_cookbooks -type f -exec bash -ec '",
+               "install -D -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) {} ",
+               "#{cookbooks_vendor_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks\\///g\")' \\;"].join,
+              "chown -R #{Process.uid}:#{Process.gid} #{berksfile_lock_path}",
+            ]
+
             application.shellout!(
               ['docker run --rm',
-               '--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 #{ssh_auth_socket_path}:#{ssh_auth_socket_path}" 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}"].compact.join(' '),
+               "dappdeps/berksdeps:0.1.0 #{application.shellout_pack(vendor_commands.join(' && '))}"].compact.join(' '),
               log_verbose: application.log_verbose?
             )
 
@@ -223,6 +256,10 @@ module Dapp
         application.build_path('chef', 'vendored_cookbooks').join(*path)
       end
 
+      def container_cookbooks_vendor_path(*path)
+        application.container_build_path('chef', 'vendored_cookbooks').join(*path)
+      end
+
       def stage_build_path(stage, *path)
         application.build_path(application.config._name, stage).join(*path)
       end

data/lib/dapp/builder/shell.rb

@@ -11,6 +11,13 @@ module Dapp
           image.add_commands(*application.config._shell.public_send("_#{m}"))
         end
       end
+
+      def chef_cookbooks_checksum
+        []
+      end
+
+      def chef_cookbooks(_image)
+      end
     end
   end
 end

data/lib/dapp/config/application.rb

@@ -61,12 +61,21 @@ module Dapp
         @_apps.empty? ? [self] : @_apps.flatten
       end
 
+      def _app_chain
+        @_app_chain ||= (_parent ? _parent._app_chain : []) + [self]
+      end
+
       def _app_runlist
-        @_app_runlist ||= (_parent ? _parent._app_runlist : []) + [self]
+        _app_chain.map(&:_name).map do |name|
+          if subname = name.split("#{_root_app._name}-", 2)[1]
+            subname_parts = subname.split('-')
+            subname_parts.join('_') if subname_parts.any?
+          end
+        end.compact
       end
 
       def _root_app
-        _app_runlist.first
+        _app_chain.first
       end
 
       private

data/lib/dapp/config/docker.rb

@@ -2,7 +2,7 @@ module Dapp
   module Config
     # Docker
     class Docker
-      attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user
+      attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint
       attr_reader :_from_cache_version
 
       def initialize
@@ -27,12 +27,12 @@ module Dapp
         @_expose.concat(args)
       end
 
-      def env(**options)
-        @_env.concat(options_to_args(options))
+      def env(*args)
+        @_env.concat(args)
       end
 
-      def label(**options)
-        @_label.concat(options_to_args(options))
+      def label(*args)
+        @_label.concat(args)
       end
 
       def cmd(*args)
@@ -51,6 +51,10 @@ module Dapp
         @_user = val
       end
 
+      def entrypoint(*cmd_with_args)
+        @_entrypoint = cmd_with_args.flatten
+      end
+
       def _from
         @_from || raise(Error::Config, code: :docker_from_not_defined)
       end
@@ -64,19 +68,14 @@ module Dapp
           cmd: _cmd,
           onbuild: _onbuild,
           workdir: _workdir,
-          user: _user
+          user: _user,
+          entrypoint: _entrypoint
         }
       end
 
       def clone
         Marshal.load(Marshal.dump(self))
       end
-
-      private
-
-      def options_to_args(options)
-        options.map {|key, value| "#{key.upcase}=#{value}" }
-      end
     end
   end
 end

data/lib/dapp/helper/shellout.rb

@@ -30,7 +30,11 @@ module Dapp
         shellout(*args, **kwargs).tap(&:error!)
       rescue ::Mixlib::ShellOut::ShellCommandFailed => e
         raise Error::Shellout, code: Trivia.class_to_lowercase(e.class),
-                               data: { stream: stream.inspect }
+                               data: { stream: stream.show }
+      end
+
+      def shellout_pack(command)
+        "bash -ec 'eval $(echo #{Base64.strict_encode64(command)} | base64 --decode)'"
       end
 
       def self.included(base)

data/lib/dapp/helper/streaming.rb

@@ -12,8 +12,8 @@ module Dapp
           buffer << string
         end
 
-        def inspect
-          buffer.join
+        def show
+          buffer.join.strip
         end
       end
 
@@ -40,7 +40,7 @@ module Dapp
         # Error
         class Error < Base
           def format_string(str)
-            Paint.paint_string(super, :warning)
+            "#{Paint.paint_string(super.strip, :warning)}\n"
           end
         end
       end

data/lib/dapp/stage_image.rb

@@ -38,6 +38,10 @@ module Dapp
       add_change_option(:workdir, value)
     end
 
+    def add_change_entrypoint(value)
+      add_change_option(:entrypoint, value)
+    end
+
     def add_change_user(value)
       add_change_option(:user, value)
     end
@@ -129,7 +133,7 @@ module Dapp
 
     def prepared_change
       prepared_options_default(change_options) do |k, vals|
-        if k == :cmd
+        if [:cmd, :entrypoint].include? k
           %(-c '#{k.to_s.upcase} #{Array(vals)}')
         else
           Array(vals).map { |v| %(-c "#{k.to_s.upcase} #{v}") }.join(' ')
@@ -142,7 +146,11 @@ module Dapp
     end
 
     def prepared_bash_command
-      "bash -ec 'eval $(echo #{Base64.strict_encode64(prepared_commands.join(' && '))} | base64 --decode)'"
+      if bash_commands.empty?
+        'true'
+      else
+        shellout_pack prepared_commands.join(' && ')
+      end
     end
 
     def prepared_commands

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -334,6 +334,7 @@ files:
 - lib/dapp/build/stage/app_install.rb
 - lib/dapp/build/stage/app_setup.rb
 - lib/dapp/build/stage/base.rb
+- lib/dapp/build/stage/chef_cookbooks.rb
 - lib/dapp/build/stage/from.rb
 - lib/dapp/build/stage/infra_install.rb
 - lib/dapp/build/stage/infra_setup.rb