luban 0.11.6 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db55acc88588f2c564a629a5a9f0e6eb00def437
-  data.tar.gz: 81e4811583bf759f8f0bf8539fabe3191802b8fc
+  metadata.gz: 410b9b5e5e7b9fbc389290fa45951741ad84dcb5
+  data.tar.gz: a55967147d22fb2d87b00b60cde50f9ff8bdd563
 SHA512:
-  metadata.gz: 69785dba1dc35b6b0f3f127d7b80386f734f6e24c775776c38ed8f4502900f7f961d62cf53f9f74e4dd508cce4347c598d9bfb364386f61990159c86e7a82dd5
-  data.tar.gz: cc6266cea980f62d9d929d242891a9b283cd41da65226cdf03f0c7abd1ed6c653b3d1f74a1f637a8f7bf9d1eca56c9b69d42495c1c6ba89a542ae3da9c3cea80
+  metadata.gz: d75e1599d8dd7d377cf5c3385d0b9e75e32338c45aa9190548696933dcc2f59c99ac7951afc7c78f8c3227e2205ea98d185b20fb9fe1320cacd38926fcaae03a
+  data.tar.gz: 1bc91fc605e99ad1c5ab5fa4a91f84e4e5b9499990870679e65d8c59fd749bc409feff9ea15f9819573869155abef20b76d07e34299f8ab64a14b81fc13856e3

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change log
 
+## Version 0.12.1 (Feb 09, 2017)
+
+Minor enhancements:
+  * Added build context in docker compose file template
+  * Used docker-compose to build application
+
+## Version 0.12.0 (Feb 08, 2017)
+
+New features
+  * Supported Docker deployment
+  * Handled docker options for remote connectivity properly
+    * Docker options could be set per stage config as well as per app server
+
+Minor enhancements:
+  * Refactored common paths into module Luban::Deployment::Package::Worker::Base
+  * Defined root paths for docker, releases, packages and deployment projects
+  * Restructured symlinks for vendor/cache and vendor/bundle
+  * Deprecated deployment release log
+  * Minor bug fixes and code cleanup
+
+## Version 0.11.6 (Feb 07, 2017)
+
+Bug fixes:
+  * Corrected symlink creations for profiles when deploying releases
+
 ## Version 0.11.6 (Feb 07, 2017)
 
 Bug fixes:

data/lib/luban/deployment/cli/application/base.rb

@@ -163,8 +163,8 @@ module Luban
 
       def build(args:, opts:)
         show_app_environment
-        install_all!(args: args, opts: opts)
         build_repositories(args: args, opts: opts)
+        install_all!(args: args, opts: opts)
       end
 
       def destroy(args:, opts:)
@@ -357,7 +357,7 @@ module Luban
         opts[:release][:tag] ||=
           release_tag(args: {}, opts: opts.merge(repository: source.merge(version: version)))
       end
-      dispatch_task :release_tag, to: :repository, as: :release_tag, locally: true
+      dispatch_task :release_tag, to: :repository, locally: true
 
       def show_app_environment
         puts "#{display_name} in #{parent.class.name}"
@@ -421,7 +421,7 @@ module Luban
       dispatch_task :deploy_cronjobs!, to: :crontab, as: :deploy_cronjobs
 
       def print_summary(result)
-        result.each do |entry|
+        Array(result).each do |entry|
           s = entry[:summary]
           puts "  [#{entry[:hostname]}] #{s[:status]} #{s[:name]} (#{s[:published]})"
           puts "  [#{entry[:hostname]}]    #{s[:alert]}" unless s[:alert].nil?

data/lib/luban/deployment/cli/application/constructor.rb

@@ -41,6 +41,7 @@ module Luban
           assure_dirs(downloads_path, archived_logs_path, 
                       tmp_path, app_bin_path, app_tmp_path, 
                       releases_path, packages_path, shared_path)
+          assure_dirs(docker_path) if dockerized?
         end
 
         def create_envrc_files

data/lib/luban/deployment/cli/application/docker/dockerable.rb

@@ -0,0 +1,46 @@
+module Luban
+  module Deployment
+    class Application
+      module Dockerable
+        def self.prepended(base)
+          base.dispatch_task :init_docker!, to: :dockerizer, as: :init_docker, locally: true
+          base.dispatch_task :dockerize_application!, to: :dockerizer, as: :dockerize_application, locally: true
+          base.dispatch_task :build_application!, to: :dockerizer, as: :build_application, locally: true
+          base.dispatch_task :distribute_application!, to: :dockerizer, as: :distribute_application
+        end
+
+        def deploy(args:, opts:)
+          super
+          dockerize_application!(args: args, opts: opts)[:build].tap do |build|
+            build_application!(args: args, opts: opts.merge(build: build))
+            distribute_application!(args: args, opts: opts.merge(build: build))
+          end
+        end
+
+        def init_profiles(args:, opts:)
+          super
+          init_docker!(args: args, 
+                       opts: opts.merge(default_docker_templates_path: default_docker_templates_path,
+                                        docker_templates_path: config_finder[:application].templates_path))
+        end
+
+        def default_docker_templates_path
+          @default_docker_template_path ||= base_templates_path(__FILE__)
+        end
+
+        protected
+
+        %i(setup! install_all! uninstall_all! destroy! 
+           binstubs! which! whence!
+           cleanup_packages! cleanup_application!
+           show_current_packages! show_summary_packages! get_summary
+           publish_release! deprecate_published_release!
+           deploy_profile!).each do |action|
+          define_method("#{action}") do |args:, opts:|
+            super(args: args, opts: opts.merge(locally: true))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/luban/deployment/cli/application/docker/dockerizer.rb

@@ -0,0 +1,277 @@
+module Luban
+  module Deployment
+    class Application
+      class Dockerizer < Worker
+        attr_reader :build
+
+        DefaultRevisionSize = 12
+
+        def docker_templates_path
+          task.opts.docker_templates_path
+        end
+
+        def default_docker_templates_path
+          task.opts.default_docker_templates_path
+        end
+
+        def default_docker_tcp_port; docker_tls_verify? ? "2376" : "2375"; end
+
+        def docker_tls_verify?; 
+          host[:docker_tls_verify].nil? ? docker_tls_verify : host[:docker_tls_verify]
+        end
+
+        def docker_ca_cert_path; docker_cert_path.join("ca.pem"); end
+        def docker_client_cert_path; docker_cert_path.join("cert.pem"); end
+        def tls_key_path; docker_cert_path.join("key.pem"); end
+
+        def tls_options
+          ["--tlsverify", "--tlscacert #{docker_ca_cert_path}",
+           "--tlscert #{docker_client_cert_path}", "--tlskey #{tls_key_path}"]
+        end
+
+        def docker_host
+          unix_socket = host[:docker_unix_socket] || docker_unix_socket
+          if unix_socket.nil?
+            tcp_port = host[:docker_tcp_port] || docker_tcp_port || default_docker_tcp_port
+            "tcp://#{hostname}:#{tcp_port}"
+          else
+            "unix://#{unix_socket}"
+          end
+        end
+
+        def docker_options
+          @docker_options ||= ["-H #{docker_host}"].concat(docker_tls_verify? ? tls_options : [])
+        end
+
+        def revision_size
+          task.opts.revision_size || DefaultRevisionSize
+        end
+
+        def init_docker
+          puts "  Initializing #{application_name} docker profile"
+          docker_templates.each do |path|
+            print "    - #{path}"
+            src_path = default_docker_templates_path.join(path)
+            dst_path = docker_templates_path.join(path)
+            if file?(dst_path)
+              puts "  [skipped]"
+            else
+              upload!(src_path, dst_path)
+              puts "  [created]"
+            end
+          end
+        end
+
+        def dockerize_application
+          rmdir(build[:path]) if force?
+          dockerize_application!
+          case build[:status]
+          when :succeeded
+            update_result "Successfully dockerized #{build[:image_tag]}."
+          when :skipped
+            update_result "Skipped! ALREADY dockerized #{build[:image_tag]}.", status: :skipped
+          else
+            update_result "FAILED to dockerize #{build[:image_tag]}.", status: :failed, level: :error
+          end
+          update_result build: build
+        end
+
+        def get_image_id(docker_options = [])
+          capture(:docker, docker_options.join(' '), :images, "-q", build[:image_tag])
+        end
+
+        def built?
+          !(build[:image_id] = get_image_id).empty?
+        end
+
+        def build_application
+          if built?
+            update_result "Skipped! ALREADY built #{build[:image_tag]}.", status: :skipped
+            return
+          end
+          output = compose_application!
+
+          if built?
+            update_result "Successfully built #{build[:image_tag]}."
+          else
+            update_result "FAILED to build #{build[:image_tag]}: #{output}.", 
+                          status: :failed, level: :error
+          end
+        end
+
+        def distributed?
+          build[:image_id] == get_image_id(docker_options)
+        end
+
+        def distribute_application
+          if distributed?
+            update_result "Skipped! ALREADY distributed #{build[:image_tag]}.", status: :skipped
+            return
+          end
+          output = distribute_application!
+
+          if distributed?
+            update_result "Successfully distributed #{build[:image_tag]}."
+          else
+            update_result "FAILED to distribute #{build[:image_tag]}: #{output}", 
+                          status: :failed, level: :error
+          end
+        end
+
+        protected
+
+        def init
+          super
+          @build = task.opts.build || init_build
+        end
+
+        def init_build
+          (@build = {}).tap do |b|
+            b[:path] = build_path
+            b[:context] = context_path
+            b[:dockerfile] = dockerfile
+            b[:compose_file] = compose_file
+            b[:compose_env_file] = compose_env_file
+            b[:sources] = init_build_sources
+            b[:archives] = init_build_archives
+            b[:revision] = compose_revision
+            b[:image_tag] = image_tag(b[:revision])
+          end
+        end
+
+        def init_build_sources
+          sources = { packages: packages_path }
+          releases = get_releases(releases_path)
+          if (v = releases.delete(:vendor))
+            sources[:vendor] = v 
+          end
+          sources.merge!(releases)
+          profile_path = releases_path.dirname.join('profile')
+          profile = directory?(profile_path) ? get_releases(profile_path) : {}
+          sources[stage.to_sym] = app_path
+          sources.merge!(profile)
+          sources.inject({}) do |srcs, (name, path)|
+            md5 = md5_for_dir(path)
+            srcs[name] = { path: path, md5: md5, tag: md5[0, revision_size] }
+            srcs
+          end
+        end
+
+        def compose_revision
+          require 'digest/md5'
+          build[:sources].inject(revisions = '') { |r, (_, src)| r += src[:md5] }
+          Digest::MD5.hexdigest(revisions)[0, revision_size]
+        end
+
+        def init_build_archives
+          build[:sources].each_key.inject(build[:archives] = {}) do |archives, name|
+            archives[name] = { path: archive_file_path("#{name}-#{build[:sources][name][:tag]}") }
+            archives
+          end
+        end
+
+        def archive_file_name(name)
+          "#{project}-#{application}-#{name}.#{archive_file_extname}"
+        end
+
+        def archive_file_extname; "tar.xz"; end
+
+        def archive_file_path(name)
+          build[:context].join(archive_file_name(name))
+        end
+
+        def build_path; docker_path.join("build-#{stage}-#{build_tag}"); end
+        def context_path; build_path.join('context'); end
+        def image_tag(revision); "#{project}-#{application}-#{stage}:#{build_tag}-#{revision}"; end
+        def dockerfile; build[:context].join("Dockerfile"); end
+        def compose_file; build[:path].join("docker-compose.yml"); end
+        def compose_env_file; build[:path].join(".env"); end
+
+        def get_releases(path)
+          capture(:ls, '-xtd', path.join('*')).split.
+            collect { |p| File.basename(p) }.
+            inject({}) { |r, t| r[t.to_sym] = path.join(t); r }
+        end
+
+        def dockerize_application!
+          assure_dirs(build[:context])
+          package_application!
+          render_dockerfile
+          render_compose_env_file
+          render_compose_file
+          build[:status] = status
+        end
+
+        def package_application!
+          build[:archives].each_pair do |name, archive|
+            source = build[:sources][name]
+            archive[:status] = 
+              if file?(archive[:path]) and archive[:path].basename.to_s =~ /#{source[:tag]}/
+                :skipped
+              else
+                execute(:tar, "-cJf", archive[:path], source[:path]) ? :succeeded : :failed
+              end
+          end
+        end
+
+        def render_dockerfile
+          upload_by_template(file_to_upload: build[:dockerfile],
+                             template_file: find_template_file('Dockerfile.erb'),
+                             auto_revision: true)
+        end
+
+        def render_compose_env_file
+          upload_by_template(file_to_upload: build[:compose_env_file],
+                             template_file: find_template_file('docker-compose-env.erb'),
+                             auto_revision: true)
+        end
+
+        def render_compose_file
+          upload_by_template(file_to_upload: build[:compose_file],
+                             template_file: find_template_file('docker-compose.yml.erb'),
+                             auto_revision: true)
+        end
+
+        def status
+          build[:archives].each_value.inject(:skipped) do |status, archive|
+            if archive[:status] == :failed
+              status = :failed; break
+            end
+            if archive[:status] == :succeeded
+              status = :succeeded 
+            end
+            status
+          end
+        end
+
+        def build_application!
+          within build[:context] do
+            capture(:docker, :build, "-t", build[:image_tag], ".", "2>&1")
+          end
+        end
+
+        def compose_application!
+          within build[:path] { capture(:"docker-compose", :build, "2>&1") }
+        end
+
+        def distribute_application!
+          capture(:docker, :save, build[:image_tag], "|", 
+                  :docker, docker_options.join(' '), "load", "2>&1")
+        end
+
+        def remove_image!(docker_options = [], image_id)
+          execute(:docker, docker_options.join(' '), :rmi, image_id, "2>/dev/null")
+        end
+
+        def docker_templates(format: "erb")
+          @docker_templates ||= 
+            if default_docker_templates_path.directory?
+              Dir.chdir(default_docker_templates_path) { Dir["**/*.#{format}"] }
+            else
+              []
+            end
+        end
+      end
+    end
+  end
+end

data/lib/luban/deployment/cli/application/docker/templates/Dockerfile.erb

@@ -0,0 +1,33 @@
+FROM <%= base_image %>
+MAINTAINER <%= author['name'] %> <%= author['email'].inspect %>
+
+RUN adduser -ms /bin/bash <%= luban_user %> && \
+    mkdir <%= luban_root_path %> && \
+    chown -R <%= luban_user %>:<%= luban_user %> <%= luban_root_path %>
+
+<% build[:archives].each_value do |archive| -%>
+ADD <%= archive[:path].basename %> /
+<% end -%>
+
+RUN ln -sf /usr/share/zoneinfo/<%= timezone %> /etc/localtime && \
+    echo "source <%= envrc_file %>" >> /home/<%= luban_user %>/.bashrc
+
+<% build[:archives].each_value do |archive| -%>
+ADD <%= archive[:path].basename %> /
+<% end -%>
+
+LABEL luban.project="<%= project %>" \
+      luban.application="<%= project %>" \
+      luban.stage="<%= stage %>" \
+      <%- build[:sources].each_pair do |name, source| -%>
+      luban.<%= name %>_tag="<%= source[:tag] %>" \
+      <%- end -%>
+      luban.build_tag="<%= build_tag %>" \
+      luban.bulid_rev="<%= build[:revision] %>"
+      luban.luban_user="<%= luban_user %>" \
+      luban.luban_root_path="<%= luban_root_path %>"
+
+USER <%= luban_user %>
+WORKDIR /home/<%= luban_user %>
+
+CMD ["/bin/bash"]

data/lib/luban/deployment/cli/application/docker/templates/docker-compose-env.erb

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME="<%= project %>"

data/lib/luban/deployment/cli/application/docker/templates/docker-compose.yml.erb

@@ -0,0 +1,9 @@
+version: "3"
+
+services:
+  <%= application %>:
+    build: ./context
+    image: <%= build[:image_tag] %>
+    entrypoint: /bin/bash
+    stdin_open: true
+    tty: true

data/lib/luban/deployment/cli/application/docker.rb

@@ -0,0 +1,2 @@
+require_relative 'docker/dockerable'
+require_relative 'docker/dockerizer'

data/lib/luban/deployment/cli/application/publisher.rb

@@ -25,20 +25,16 @@ module Luban
           @releases_path ||= super.dirname.join(release_type)
         end
 
-        def releases_log_path
-          @releases_log_path ||= app_path.join('releases.log')
-        end
-
         def bundle_config_path
-          @bundle_config_path ||= shared_path.join('.bundle')
+          @bundle_config_path ||= releases_path.join('.bundle')
         end
 
         def bundle_path
-          @bundle_path ||= shared_path.join('vendor', 'bundle')
+          @bundle_path ||= releases_path.join('vendor', 'bundle')
         end
 
         def gems_cache_path
-          @gems_cache_path ||= shared_path.join('vendor', 'cache')
+          @gems_cache_path ||= releases_path.join('vendor', 'cache')
         end
 
         def bundle_without
@@ -102,7 +98,6 @@ module Luban
              test(:tar, "-xzf #{upload_to} -C #{releases_path}")
             touch(release_path)
             create_symlinks
-            update_releases_log
           else
             rmdir(release_path)
           end
@@ -113,6 +108,7 @@ module Luban
         def create_symlinks
           send("create_#{release_type}_symlinks")
           if has_gemfile?
+            create_linked_dirs(bundle_linked_dirs, from: releases_path, to: shared_path)
             create_linked_dirs(bundle_linked_dirs, to: release_path)
           end
         end
@@ -141,14 +137,6 @@ module Luban
           create_linked_files(to: release_path)
         end
 
-        def update_releases_log
-          execute %{echo "[$(date -u)][#{user}] #{release_log_message}" >> #{releases_log_path}}
-        end
-
-        def release_log_message
-          "#{release_name} in #{stage} #{project} is published successfully."
-        end
-
         def cleanup_releases(keep_releases = 1)
           files = capture(:ls, '-xtd', releases_path.join("#{release_version}-*")).split(" ")
           if files.count > keep_releases

data/lib/luban/deployment/cli/application/repository.rb

@@ -214,7 +214,7 @@ module Luban
               md5_file = gems_path.join("#{gem_file}.md5")
               gems[gem_name] =
                 if file?(md5_file)
-                  gems[gem_name] = capture(:cat, md5_file)
+                  capture(:cat, md5_file)
                 else
                   md5_for(gem_file).tap { |md5| execute(:echo, "#{md5} > #{md5_file}") }
                 end

data/lib/luban/deployment/cli/application/worker.rb

@@ -4,6 +4,7 @@ module Luban
       class Worker < Luban::Deployment::Worker::Base
         include Luban::Deployment::Worker::Paths::Remote
         include Luban::Deployment::Service::Worker::Base
+        include Luban::Deployment::Package::Worker::Base
 
         def gemfile
           @gemfile ||= release_path.join('Gemfile')
@@ -19,12 +20,16 @@ module Luban
           define_method("application_#{method}") { send("target_#{method}") }
         end
 
+        def docker_path
+          @docker_path ||= docker_root_path.join(project, application)
+        end
+
         def profile_name; 'app'; end
 
         def release_tag; task.opts.release[:tag]; end
 
         def releases_path
-          @releases_path ||= super.join(project, application, 'app')
+          @releases_path ||= releases_root_path.join(project, application, 'app')
         end
 
         def release_path

data/lib/luban/deployment/cli/application.rb

@@ -7,4 +7,4 @@ require_relative 'application/publisher'
 require_relative 'application/configurator'
 require_relative 'application/controller'
 require_relative 'application/crontab'
-
+require_relative 'application/docker'

data/lib/luban/deployment/cli/command.rb

@@ -291,7 +291,7 @@ module Luban
 
         def dispatch_task(task, to:, as: task, locally: false, &blk)
           define_method(task) do |args:, opts:|
-            run_task(cmd: as, args: args, opts: opts, locally: locally,
+            run_task(cmd: as, args: args, opts: opts, locally: locally || opts[:locally],
                      worker_class: self.class.worker_class(to), &blk)
           end
 
@@ -356,7 +356,7 @@ module Luban
 
       def set_parameters
         copy_parameters_from_parent(
-          :luban_roles, :luban_root_path, :work_dir, :apps_path,
+          :luban_roles, :luban_root_path, :work_dir, :apps_path, :author,
           :stages, :applications, :user, :skip_promptless_authen
         )
       end

data/lib/luban/deployment/cli/package/base.rb

@@ -268,7 +268,7 @@ module Luban
         end
 
         def print_summary(result)
-          result.each do |entry|
+          Array(result).each do |entry|
             s = entry[:summary]
             puts "  [#{entry[:hostname]}] #{s[:status]} #{s[:name]} (#{s[:installed]})"
             puts "  [#{entry[:hostname]}]      #{s[:executable]}" unless s[:executable].nil?

data/lib/luban/deployment/cli/package/installer/install.rb

@@ -157,19 +157,21 @@ module Luban
         end
 
         def which_current
-          get_summary
-          task.result.summary[:executable] = "Not found"
-          if current? and current_symlinked? and
-             file?(executable = File.join(readlink(current_path), 'bin', task.args.executable))
-            task.result.summary[:executable] = executable
+          get_summary.tap do |result|
+            result.summary[:executable] = "Not found"
+            if current? and current_symlinked? and
+               file?(executable = File.join(readlink(current_path), 'bin', task.args.executable))
+              result.summary[:executable] = executable
+            end
           end
         end
 
         def whence_origin
-          get_summary
-          task.result.summary[:executable] = "Not found"
-          if file?(executable = bin_path.join(task.args.executable))
-            task.result.summary[:executable] = executable
+          get_summary.tap do |result|
+            result.summary[:executable] = "Not found"
+            if file?(executable = bin_path.join(task.args.executable))
+              result.summary[:executable] = executable
+            end
           end
         end
 

data/lib/luban/deployment/cli/package/worker.rb

@@ -4,6 +4,23 @@ module Luban
       class Worker < Luban::Deployment::Worker::Base
         include Luban::Deployment::Worker::Paths::Remote
 
+        module Base
+          def packages_path
+            @packages_path ||= packages_root_path.join(project, application)
+          end
+
+          def package_install_path(package_name)
+            packages_path.join(package_name.to_s, 'versions',
+                               packages[package_name.to_sym].current_version)
+          end
+
+          def package_bin_path(package_name)
+            package_install_path(package_name).join('bin')
+          end
+        end
+
+        include Base
+
         class << self
           def package_class(package)
             Luban::Deployment::Package::Base.package_class(package)
@@ -41,10 +58,6 @@ module Luban
           @current_bin_path ||= current_path.join('bin')
         end
 
-        def packages_path
-          @packages_path ||= super.join(project, application)
-        end
-
         def package_path
           @package_path ||= packages_path.join(package_name)
         end

data/lib/luban/deployment/configuration/core.rb

@@ -45,14 +45,11 @@ module Luban
         if name == :all
           raise ArgumentError, 'Reserved role name, :all, is NOT allowed to use.'
         end
-        @servers.add_hosts_for_role(name, hosts, properties)
+        servers.add_hosts_for_role(name, hosts, properties)
       end
 
       def server(name, **properties)
-        new_server = servers.add_host(name, properties)
-        if new_server
-          new_server.ssh_options = fetch(:ssh_options) || {}
-        end
+        servers.add_host(name, properties)
       end
 
       def ask(key=nil, default:, prompt: nil, echo: true)

data/lib/luban/deployment/helpers/configuration.rb

@@ -25,11 +25,11 @@ module Luban
         end
 
         def role(name, hosts, **properties)
-          config.role(name, hosts, properties)
+          config.role(name, hosts, properties.merge(local: dockerized?))
         end
 
         def server(name, **properties)
-          config.server(name, properties)
+          config.server(name, properties.merge(local: dockerized?))
         end
 
         def roles(*names)

data/lib/luban/deployment/parameters.rb

@@ -26,6 +26,10 @@ module Luban
           mod.extend(Base)
         end
 
+        def current_user
+          ENV['USER'] || `whoami`.chomp
+        end
+
         parameter :luban_roles, default: %i(app)
         parameter :luban_root_path, default: DefaultLubanRootPath
 
@@ -36,7 +40,8 @@ module Luban
         parameter :work_dir
         parameter :apps_path
         parameter :project
-        parameter :user, default: ENV['USER']
+        parameter :user, default: -> { current_user }
+        parameter :author
         parameter :config_finder, default: ->{ Hash.new }
 
         parameter :skip_promptless_authen, default: false
@@ -44,7 +49,10 @@ module Luban
         protected
 
         def validate_for_user
-          if user != ENV['USER']
+          if user.nil?
+            abort "Abort! Please specify the user name: user 'user name'"
+          end
+          if user != current_user
             abort "Aborted! Given deployment user (#{user.inspect}) is NOT the current user #{ENV['USER'].inspect}" +
                   "Please switch to the deployment user before any deployments."
           end
@@ -107,8 +115,32 @@ module Luban
         end
       end
 
+      module Docker
+        extend Base
+
+        parameter :luban_user, default: 'luban'
+        parameter :build_tag, default: '0.0.0'
+        parameter :base_image, default: 'centos:7'
+        parameter :timezone, default: 'UTC'
+        parameter :docker_tls_verify, default: false
+        parameter :docker_cert_path
+        parameter :docker_tcp_port
+        parameter :docker_unix_socket
+
+        def validate_for_docker_cert_path
+          return if !docker_tls_verify and docker_cert_path.nil?
+          if docker_cert_path.is_a?(String)
+            docker_cert_path Pathname.new(docker_cert_path)
+          end
+          unless docker_cert_path.is_a?(Pathname)
+            abort "Aborted! Docker cert path should be a String or a Pathname: docker_cert_path 'path to docker certs'"
+          end
+        end
+      end
+
       module Application
         extend Base
+        include Docker
 
         DefaultLogrotateMaxAge = 7 # days
         DefaultLogrotateInterval = 10 # mins
@@ -123,6 +155,16 @@ module Luban
           @env_name ||= "#{stage}.#{project}/#{application}"
         end
 
+        def dockerize
+          unless dockerized?
+            singleton_class.send(:prepend, Luban::Deployment::Application::Dockerable)
+            set :dockerized, true
+            skip_promptless_authen true
+          end
+        end
+
+        def dockerized?; fetch :dockerized; end
+
         def monitor_itself?
           env_name == process_monitor[:env]
         end

data/lib/luban/deployment/runner.rb

@@ -10,7 +10,8 @@ module Luban
       def default_rc
         @default_rc ||= { 'luban_roles' => %i(app),
                           'luban_root_path' => Parameters::General::DefaultLubanRootPath,
-                          'stages' => %w(development staging production)
+                          'stages' => %w(development staging production),
+                          'author' => { 'name' => 'author name', 'email' => 'author@email.com' }
                         }
       end
 
@@ -46,7 +47,7 @@ module Luban
       end
 
       def set_default_common_parameters
-        %i(luban_roles luban_root_path stages).each { |p| set_default p, rc[p.to_s] }
+        %i(luban_roles luban_root_path stages author).each { |p| set_default p, rc[p.to_s] }
         set_default :user, (rc['user'] || ENV['USER'])
       end
 

data/lib/luban/deployment/templates/application/config/deploy/__stage.rb.erb

@@ -1,4 +1,6 @@
 # Deployment configuration for <%= stage %> application <%= application_class_name %>
 
+# build_tag '0.0.0'
+
 # Application servers
 role :app, `hostname -f`.chomp

data/lib/luban/deployment/templates/application/config/deploy.rb.erb

@@ -1 +1,5 @@
 # Deployment configuration for application <%= application_class_name %>
+
+# Turn on docker support
+# dockerize
+# timezone 'Asia/Shanghai'

data/lib/luban/deployment/templates/crontab_header.erb

@@ -1,3 +1,2 @@
 <%= crontab_open %>
 # Revision: <%= revision %>
-# Created at <%= now %>

data/lib/luban/deployment/templates/header.erb

@@ -1,4 +1,3 @@
 # Environment: <%= env_name %>
 # Revision: <%= revision %>
-# Created at <%= now %>
 

data/lib/luban/deployment/templates/project/.gitignore

@@ -1,7 +1,7 @@
 /.bundle/
-/Gemfile.lock
 .luban/
 vendor/cache/
+vendor/bundle/
 env_vars.rb
 .DS_Store
 .gitkeep

data/lib/luban/deployment/templates/project/Lubanfile.rb.erb

@@ -1,2 +1,3 @@
 stages %w(<%= stages.join(' ') %>)
-project <%= project.inspect %>
+project <%= project.inspect %>
+author name: <%= author['name'] %>, email: <%= author['email'] %>

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.11.6"
+    VERSION = "0.12.1"
   end
 end

data/lib/luban/deployment/worker/paths.rb

@@ -17,8 +17,12 @@ module Luban
         end
 
         module Remote
-          def releases_path
-            @releases_path ||= luban_root_path.join('releases')
+          def deployment_projects_path
+            @deployment_projects_path ||= luban_root_path.join('projects')
+          end
+
+          def releases_root_path
+            @releases_root_path ||= luban_root_path.join('releases')
           end
 
           def env_path
@@ -38,6 +42,10 @@ module Luban
             @downloads_path ||= luban_root_path.join('downloads')
           end
 
+          def docker_root_path
+            @docker_root_path ||= luban_root_path.join('docker')
+          end
+
           def project_path
             @project_path ||= env_path.join("#{stage}.#{project}")
           end
@@ -70,17 +78,8 @@ module Luban
             @unset_envrc_file ||= app_path.join(".unset_envrc")
           end
 
-          def packages_path
-            @packages_path ||= luban_root_path.join('packages')
-          end
-
-          def package_install_path(package_name)
-            packages_path.join(project, application, package_name.to_s, 'versions',
-                               packages[package_name.to_sym].current_version)
-          end
-
-          def package_bin_path(package_name)
-            package_install_path(package_name).join('bin')
+          def packages_root_path
+            @packages_root_path ||= luban_root_path.join('packages')
           end
 
           def app_archives_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.12.1
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -107,6 +107,12 @@ files:
 - lib/luban/deployment/cli/application/constructor.rb
 - lib/luban/deployment/cli/application/controller.rb
 - lib/luban/deployment/cli/application/crontab.rb
+- lib/luban/deployment/cli/application/docker.rb
+- lib/luban/deployment/cli/application/docker/dockerable.rb
+- lib/luban/deployment/cli/application/docker/dockerizer.rb
+- lib/luban/deployment/cli/application/docker/templates/Dockerfile.erb
+- lib/luban/deployment/cli/application/docker/templates/docker-compose-env.erb
+- lib/luban/deployment/cli/application/docker/templates/docker-compose.yml.erb
 - lib/luban/deployment/cli/application/publisher.rb
 - lib/luban/deployment/cli/application/repository.rb
 - lib/luban/deployment/cli/application/scm/git.rb