indocker 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405310bd24a8adfa838f82a3cac79f2fa125083ebcb4cf788d27332875d52353
-  data.tar.gz: 12103e2edb743e5024f50496962883f271c095bcd6264934c3295309fbf8e762
+  metadata.gz: 288383229ce87e66ab3869aa6fcd5180e0a54d09ca4046ed32a4ec34550a564f
+  data.tar.gz: 77eed21c9ad07145d0141c8450495fd74b6336cea91fc76a5dc37909f3983ee6
 SHA512:
-  metadata.gz: fd602a0202c99b48303ee69a129b9f8cbfa9d621a7d2ea3f84b1446613ed8210b7ad103005967ce0459407a49482fcababf1b72f27254b1e6d5fcc29175c2ceb
-  data.tar.gz: 67f12a6d6b2715bde6034dbbc1b6e0a2c42bcc7c27a5e66fe40bde489db8f50cd42fb1805e03e04e35a76dd9a1f82bb754e942beba68a9fba5a4751614644dbb
+  metadata.gz: 6e91c51c6898841882c3543a31710b84db43e2fc20498174119b269eaa47f9caf260a0720d99645a03dd292d470be4adadaaec6d4cadebce1290998782a3156a
+  data.tar.gz: cbf4395ff9f1f21c56785fa926dbaf3af80f33cad68041fa4ee9c2e8cee85faa353f0efe9c34aa23707b47764e5a0c6b4359dacf1a50b17f4e02db003455689d

data/Gemfile

@@ -4,3 +4,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in indocker.gemspec
 gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'pry'
+end

data/Gemfile.lock

@@ -1,15 +1,20 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.7)
+    indocker (0.1.12)
       net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.3)
+    method_source (1.0.0)
     net-ssh (6.1.0)
-    rake (10.5.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -30,8 +35,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   indocker!
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  pry
+  rake (~> 12.3.3)
+  rspec
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -1,5 +1,7 @@
 # InDocker
 
+[![Codeship Status for ArtStation/indocker](https://app.codeship.com/projects/bf8888c0-b7e4-0138-fc1f-7e2faa53772a/status?branch=master)](https://app.codeship.com/projects/404716)
+
 Docker Containers Deployment
 
 ## Installation
@@ -8,11 +10,20 @@ Docker Containers Deployment
 $ gem install indocker
 ```
 
-## Development: Launch example app
+## Development: Launch example app locally
+
+```ruby
+cd example
+indocker/bin/deploy -C dev -c ruby -d
+```
+
+## Development: Launch example with external host
+
+NOTE: Default external host requires extra permissions.
 
 ```ruby
 cd example
-bundle exec indocker/bin/deploy -C dev -c ruby -d
+indocker/bin/deploy -C external -c ruby -d
 ```
 
 ## License

data/example/indocker/bin/deploy

@@ -8,9 +8,10 @@ configurations = list_configurations(File.expand_path(File.join(__dir__, '../con
 ARGV << '-h' if ARGV.empty?
 
 options = {
-  skip_build: false,
-  force_restart: false,
-  skip_tags: [],
+  skip_build:         false,
+  skip_deploy:        false,
+  force_restart:      false,
+  skip_tags:          [],
   skip_force_restart: [],
 }
 
@@ -61,6 +62,10 @@ OptionParser.new do |opts|
     options[:skip_build] = true
   end
 
+  opts.on("-b", "--skip-deploy", "Skip image deploy") do |val|
+    options[:skip_deploy] = true
+  end
+
   opts.on("-y", "--auto-confirm", "Automatically confirm deployment") do |val|
     options[:auto_confirm] = true
   end
@@ -106,15 +111,16 @@ Indocker.set_configuration_name(options[:configuration])
 require_relative '../setup'
 
 Indocker.deploy(
-  containers: options[:containers] || [],
-  tags: options[:tags] || [],
-  skip_containers: options[:skip_containers] || [],
-  skip_dependent: !!options[:skip_dependent],
-  servers: options[:servers] || [],
-  skip_build: options[:skip_build],
-  force_restart: options[:force_restart],
-  skip_tags: options[:skip_tags] || [],
-  skip_force_restart: options[:skip_force_restart] || [],
-  auto_confirm: !!options[:auto_confirm],
+  containers:           options[:containers] || [],
+  tags:                 options[:tags] || [],
+  skip_containers:      options[:skip_containers] || [],
+  skip_dependent:       !!options[:skip_dependent],
+  servers:              options[:servers] || [],
+  skip_build:           options[:skip_build],
+  skip_deploy:          options[:skip_deploy],
+  force_restart:        options[:force_restart],
+  skip_tags:            options[:skip_tags] || [],
+  skip_force_restart:   options[:skip_force_restart] || [],
+  auto_confirm:         !!options[:auto_confirm],
   require_confirmation: !!options[:require_confirmation],
 )

data/example/indocker/bounded_contexts/shared/bad_container_build/Dockerfile

@@ -0,0 +1,3 @@
+FROM ruby:2.5.0
+
+RUN some-unexisting-command

data/example/indocker/bounded_contexts/shared/bad_container_build/container.rb

@@ -0,0 +1,5 @@
+Indocker
+  .define_container(:bad_container_build)
+  .tags('bad_container_build', 'console=true')
+  .image(:bad_container_build)
+  .networks(:app_net)

data/example/indocker/bounded_contexts/shared/bad_container_build/image.rb

@@ -0,0 +1,3 @@
+Indocker
+  .define_image(:bad_container_build)
+  .registry(:default)

data/example/indocker/bounded_contexts/shared/bad_container_start/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.5.0
+
+RUN mkdir /app
+WORKDIR /app
+
+COPY bin bin
+
+CMD ["bin/run"]

data/example/indocker/bounded_contexts/shared/bad_container_start/build_context/bin/run

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+raise "Some error"

data/example/indocker/bounded_contexts/shared/bad_container_start/container.rb

@@ -0,0 +1,5 @@
+Indocker
+  .define_container(:bad_container_start)
+  .tags('bad_container_start', 'console=true')
+  .image(:bad_container_start)
+  .networks(:app_net)

data/example/indocker/bounded_contexts/shared/bad_container_start/image.rb

@@ -0,0 +1,3 @@
+Indocker
+  .define_image(:bad_container_start)
+  .registry(:default)

data/example/indocker/bounded_contexts/shared/good_container/Dockerfile

@@ -0,0 +1,4 @@
+FROM ruby:2.5.0
+
+RUN mkdir /app
+WORKDIR /app

data/example/indocker/bounded_contexts/shared/good_container/container.rb

@@ -0,0 +1,5 @@
+Indocker
+  .define_container(:good_container)
+  .tags('good_container', 'console=true')
+  .image(:good_container)
+  .networks(:app_net)

data/example/indocker/bounded_contexts/shared/good_container/image.rb

@@ -0,0 +1,3 @@
+Indocker
+  .define_image(:good_container)
+  .registry(:default)

data/example/indocker/configurations/external.rb

@@ -0,0 +1,18 @@
+Indocker
+  .build_configuration(:external)
+  .use_registry(:dev, as: :default)
+  .use_build_server(:external_bs)
+  .enabled_containers(
+    ruby: {
+      servers: [:external],
+    },
+    good_container: {
+      servers: [:external],
+    },
+    bad_container_build: {
+      servers: [:external],
+    },
+    bad_container_start: {
+      servers: [:external],
+    }
+  )

data/example/indocker/infrastructure/build_servers.rb

@@ -5,4 +5,15 @@ Indocker.add_build_server(
     user: `whoami`.strip,
     port: 22
   )
+)
+
+external_host = ENV['INDOCKER_EXTERNAL_HOST'] || 'indocker.artstn.ninja'
+external_user = ENV['INDOCKER_EXTERNAL_USER'] || 'indocker'
+Indocker.add_build_server(
+  Indocker::BuildServer.new(
+    name: :external_bs,
+    host: external_host,
+    user: external_user,
+    port: 22
+  )
 )

data/example/indocker/infrastructure/servers.rb

@@ -5,4 +5,15 @@ Indocker.add_server(
     user: `whoami`.strip,
     port: 22
   )
+)
+
+external_host = ENV['INDOCKER_EXTERNAL_HOST'] || 'indocker.artstn.ninja'
+external_user = ENV['INDOCKER_EXTERNAL_USER'] || 'indocker'
+Indocker.add_server(
+  Indocker::Server.new(
+    name: :external,
+    host: external_host,
+    user: external_user,
+    port: 22
+  )
 )

data/example/indocker/setup.rb

@@ -3,7 +3,7 @@ require 'indocker'
 root_dir = File.join(__dir__, '..', '..')
 
 Indocker.set_root_dir(__dir__)
-Indocker.set_deploy_dir(File.join(root_dir, 'tmp', 'deployment'))
+Indocker.set_deploy_dir('~/deployment')
 
 Indocker.set_dockerignore [
   'Dockerfile',

data/example/spec/indocker_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+RSpec.describe Indocker do
+  it "has a version number" do
+    expect(Indocker::VERSION).not_to be nil
+  end
+
+  describe "successful deployment" do
+    it "doesn't raise any error" do
+      expect{
+        launch_deployment(containers: [:good_container])
+      }.to_not raise_error
+    end
+
+    it "shows a message about successful deploy" do
+      allow(Indocker.global_logger).to receive(:info).at_least(:once)
+      
+      launch_deployment(containers: [:good_container])
+
+      expect(Indocker.global_logger).to have_received(:info).at_least(:once).with(/Deployment finished/)
+    end
+  end
+
+  describe "failed build" do
+    it "exits with an error" do
+      expect{
+        launch_deployment(containers: [:bad_container_build])
+      }.to raise_error(SystemExit)
+    end
+  end
+
+  describe "failed start" do
+    it "exits without error" do
+      expect{
+        launch_deployment(containers: [:bad_container_start])
+      }.to_not raise_error(SystemExit)
+    end
+  end
+end

data/example/spec/spec_helper.rb

@@ -0,0 +1,39 @@
+require "bundler/setup"
+require "indocker"
+require "pry"
+
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+def launch_deployment(options = {})
+  require_relative '../indocker/bin/utils/configurations'
+
+  Indocker.set_configuration_name(options[:configuration] || "external")
+  require_relative '../indocker/setup'
+
+  Indocker.set_log_level(options[:debug] ? Logger::DEBUG : Logger::INFO)
+
+  Indocker.deploy(
+    containers:           options[:containers] || [],
+    tags:                 options[:tags] || [],
+    skip_containers:      options[:skip_containers] || [],
+    skip_dependent:       !!options[:skip_dependent],
+    servers:              options[:servers] || [],
+    skip_build:           options[:skip_build],
+    skip_deploy:          options[:skip_deploy],
+    force_restart:        options[:force_restart],
+    skip_tags:            options[:skip_tags] || [],
+    skip_force_restart:   options[:skip_force_restart] || [],
+    auto_confirm:         !!options[:auto_confirm],
+    require_confirmation: !!options[:require_confirmation],
+  )
+end

data/indocker.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "net-ssh"
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/indocker.rb

@@ -88,7 +88,9 @@ module Indocker
   autoload :SshResultLogger, 'ssh_result_logger'
   autoload :DeploymentProgress, 'deployment_progress'
   autoload :DeploymentChecker, 'deployment_checker'
+  autoload :DeploymentPolicy, 'deployment_policy'
   autoload :CrontabRedeployRulesBuilder, 'crontab_redeploy_rules_builder'
+  autoload :LoggerFactory, 'logger_factory'
 
   class << self
     def set_export_command(command)
@@ -318,22 +320,31 @@ module Indocker
       builder
     end
 
-    def deploy(containers: [], skip_tags: [], tags: [], skip_dependent: false, skip_containers: [], servers: [], skip_build: false, force_restart: false, skip_force_restart: [], auto_confirm: false, require_confirmation: false)
+    def deploy(containers: [], skip_tags: [], tags: [], skip_dependent: false, 
+      skip_containers: [], servers: [], skip_build: false, skip_deploy: false,
+      force_restart: false, skip_force_restart: [], auto_confirm: false, 
+      require_confirmation: false)
+
+      deployment_policy = Indocker::DeploymentPolicy.new(
+        deploy_containers:    containers,
+        deploy_tags:          tags,
+        servers:              servers,
+        skip_dependent:       skip_dependent,
+        skip_containers:      skip_containers,
+        skip_build:           skip_build,
+        skip_deploy:          skip_deploy,
+        skip_tags:            skip_tags,
+        force_restart:        force_restart,
+        skip_force_restart:   skip_force_restart,
+        auto_confirm:         auto_confirm,
+        require_confirmation: require_confirmation,
+      )
+
       Indocker::ConfigurationDeployer
-        .new(Indocker.logger)
+        .new(logger: Indocker.logger, global_logger: Indocker.global_logger)
         .run(
-          configuration: configuration,
-          deploy_containers: containers,
-          deploy_tags: tags,
-          skip_dependent: skip_dependent,
-          skip_containers: skip_containers,
-          servers: servers,
-          skip_build: skip_build,
-          force_restart: force_restart,
-          skip_tags: skip_tags,
-          skip_force_restart: skip_force_restart,
-          auto_confirm: auto_confirm,
-          require_confirmation: require_confirmation,
+          configuration:     configuration,
+          deployment_policy: deployment_policy
         )
     end
 
@@ -385,56 +396,26 @@ module Indocker
       Indocker::BuildContextHelper.new(Indocker.configuration, nil)
     end
 
+    # This logger outputs progress of the deployment
+    # It will not output anything for deployment without debug option
     def logger
       @logger ||= begin
-        logger = if @log_level == Logger::DEBUG
-          Logger.new(STDOUT)
+        logger_stdout = if @log_level == Logger::DEBUG
+          STDOUT
         else
-          Logger.new(File.open(File::NULL, "w"))
-        end
-
-        logger.level = @log_level || Logger::INFO
-
-        logger.formatter = proc do |severity, datetime, progname, msg|
-          level = Logger::SEV_LABEL.index(severity)
-
-          severity = case level
-          when Logger::INFO
-            severity.green
-          when Logger::WARN
-            severity.purple
-          when Logger::DEBUG
-            severity.yellow
-          when Logger::ERROR
-            severity.red
-          when Logger::FATAL
-            severity.red
-          else
-            severity
-          end
-
-          severity = severity.downcase
-
-          if logger.debug?
-            if msg == "{timestamp}"
-              ""
-            else
-              "#{datetime.strftime("%Y/%m/%d %H:%M:%S")} #{severity}: #{msg}\n"
-            end
-          else
-            # Use a nicer logging for not debug
-            if msg == "{timestamp}"
-              datetime.strftime("%Y/%m/%d %H:%M:%S\n").grey
-            else
-              "  #{severity}: #{msg}\n"
-            end
-          end
+          File.open(File::NULL, "w")
         end
 
-        logger
+        Indocker::LoggerFactory.create(logger_stdout, @log_level)
       end
     end
 
+    # Global logger would output data without dependency on how we deploy the progress
+    # Currently it will always output data to stdout
+    def global_logger
+      @global_logger ||= Indocker::LoggerFactory.create(STDOUT, @log_level)
+    end
+
     def set_log_level(level)
       @log_level = level
     end

data/lib/indocker/build_context.rb

@@ -3,22 +3,24 @@ require 'fileutils'
 class Indocker::BuildContext
   attr_reader :session, :server, :configuration, :helper, :logger
 
-  def initialize(configuration:, build_server:, logger:)
+  def initialize(configuration:, build_server:, logger:, global_logger:)
     @configuration = configuration
     @logger = logger
     @helper = Indocker::BuildContextHelper.new(@configuration, @build_server)
     @server = build_server
+    @global_logger = global_logger
+    @compiled_images = Hash.new(false)
+  end
 
-    if build_server
-      @session = Indocker::SshSession.new(
-        host: build_server.host,
-        user: build_server.user,
-        port: build_server.port,
-        logger: @logger
-      )
-    end
+  def create_session!
+    return unless @server
 
-    @compiled_images = Hash.new(false)
+    @session = Indocker::SshSession.new(
+      host: @server.host,
+      user: @server.user,
+      port: @server.port,
+      logger: @logger
+    )
   end
 
   def exec!(command)
@@ -69,10 +71,10 @@ class Indocker::BuildContext
       build_args = args.join(' ')
 
       res = Indocker::Docker.build(image.local_registry_url, build_args)
-
+      
       if res.exit_status != 0
-        @logger.error("image compilation :#{image.name} failed")
-        @logger.error(res.stdout)
+        @global_logger.error("image compilation :#{image.name} failed")
+        @global_logger.error(res.stdout)
         exit 1
       end
 

data/lib/indocker/build_context_pool.rb

@@ -1,17 +1,23 @@
 class Indocker::BuildContextPool
-  def initialize(configuration:, logger:)
+  def initialize(configuration:, logger:, global_logger:)
     @logger = logger
     @configuration = configuration
+    @global_logger = global_logger
 
     @contexts = configuration.build_servers.map do |build_server|
       Indocker::BuildContext.new(
         logger: @logger,
         configuration: configuration,
         build_server: build_server,
+        global_logger: @global_logger,
       )
     end
   end
 
+  def create_sessions!
+    @contexts.each(&:create_session!)
+  end
+
   def get
     context = nil
 

data/lib/indocker/configuration_deployer.rb

@@ -5,92 +5,109 @@ require 'tempfile'
 class Indocker::ConfigurationDeployer
   REMOTE_OPERATION_TIMEOUT = 60
 
-  def initialize(logger)
+  def initialize(logger:, global_logger:)
     Thread.abort_on_exception = true # abort all threads if exception occurs
 
     @logger = logger
-    @global_logger = Logger.new(STDOUT)
-    @global_logger.formatter = logger.formatter
+    @global_logger = global_logger
 
     @progress = Indocker::DeploymentProgress.new(
       Indocker.logger.level == Logger::DEBUG ? nil : Logger.new(STDOUT)
     )
   end
 
-  def run(configuration:, deploy_containers:, skip_tags:, deploy_tags:, skip_dependent:,
-          skip_containers:, servers:, skip_build:, force_restart:, skip_force_restart:, auto_confirm:, require_confirmation:)
+  # Launch deployment & measure the benchmark
+  def run(configuration:, deployment_policy:)
     build_context_pool = nil
     deployer = nil
 
     time = Benchmark.realtime do
-      if force_restart
+      if deployment_policy.force_restart
         @logger.warn("WARNING. All containers will be forced to restart.")
       end
 
-      if skip_build
+      if deployment_policy.skip_build
         @logger.warn("WARNING. Images build step will be skipped")
       end
 
-      preload_containers(configuration)
-
-      containers = find_deploy_containers(configuration, deploy_containers, deploy_tags, skip_dependent, skip_containers, servers, skip_tags, auto_confirm, require_confirmation)
-      containers = containers.uniq {|c| c.name}
-
-      clonner = Indocker::Repositories::Clonner.new(configuration, @logger)
-
-      @global_logger.info("Establishing ssh sessions to all servers...")
-
-      build_context_pool = Indocker::BuildContextPool.new(configuration: configuration, logger: @logger)
-      deployer = Indocker::ContainerDeployer.new(configuration: configuration, logger: @logger)
-
-      build_servers = configuration
-        .build_servers
-        .uniq { |s| s.host }
-
-      deploy_servers = containers
-        .map(&:servers)
-        .flatten
-        .uniq { |s| s.host }
+      if deployment_policy.skip_deploy
+        @logger.warn("WARNING. Images deploy step will be skipped")
+      end
 
-      servers = (deploy_servers + build_servers).uniq { |s| s.host }
+      run!(configuration: configuration, deployment_policy: deployment_policy)
+    end
 
-      @progress.setup(
-        binaries_servers: servers,
-        build_servers: build_servers,
-        deploy_servers: deploy_servers,
-        env_files: configuration.env_files.keys,
-        repositories: configuration.repositories.keys,
-        force_restart: force_restart,
-        skip_build: skip_build,
-        containers: containers,
-        artifact_servers: configuration.artifact_servers,
-      )
+    @global_logger.info("Deployment finished".green)
+    @global_logger.info("Total time taken: #{time.round}s".green)
+  end
 
-      remote_operations = sync_indocker(servers)
-      wait_remote_operations(remote_operations)
+  # The main flow of the deployment would happen in this method.
+  def run!(configuration:, deployment_policy:)
+    containers = find_containers_to_deploy(configuration, deployment_policy)
+
+    clonner = Indocker::Repositories::Clonner.new(configuration, @logger)
+    build_context_pool = Indocker::BuildContextPool.new(configuration: configuration, logger: @logger, global_logger: @global_logger)
+    deployer = Indocker::ContainerDeployer.new(configuration: configuration, logger: @logger)
+    
+    @global_logger.info("Establishing ssh sessions to all servers...")
+    build_context_pool.create_sessions!
+    deployer.create_sessions!
+
+    build_servers = configuration
+      .build_servers
+      .uniq { |s| s.host }
+
+    deploy_servers = containers
+      .map(&:servers)
+      .flatten
+      .uniq { |s| s.host }
+
+    servers = (deploy_servers + build_servers).uniq { |s| s.host }
+
+    @progress.setup(
+      binaries_servers: servers,
+      build_servers:    build_servers,
+      deploy_servers:   deploy_servers,
+      env_files:        configuration.env_files.keys,
+      repositories:     configuration.repositories.keys,
+      force_restart:    deployment_policy.force_restart,
+      skip_build:       deployment_policy.skip_build,
+      skip_deploy:      deployment_policy.skip_deploy,
+      containers:       containers,
+      artifact_servers: configuration.artifact_servers,
+    )
 
-      remote_operations = sync_env_files(deploy_servers, configuration.env_files)
-      wait_remote_operations(remote_operations)
+    remote_operations = sync_indocker(servers)
+    wait_remote_operations(remote_operations)
 
-      remote_operations = pull_repositories(clonner, build_servers, configuration.repositories)
-      wait_remote_operations(remote_operations)
+    remote_operations = sync_env_files(deploy_servers, configuration.env_files)
+    wait_remote_operations(remote_operations)
 
-      remote_operations = sync_artifacts(clonner, configuration.artifact_servers)
-      wait_remote_operations(remote_operations)
+    remote_operations = pull_repositories(clonner, build_servers, configuration.repositories)
+    wait_remote_operations(remote_operations)
 
-      update_crontab_redeploy_rules(configuration, build_servers.first)
+    remote_operations = sync_artifacts(clonner, configuration.artifact_servers)
+    wait_remote_operations(remote_operations)
 
-      containers.uniq.each do |container|
-        recursively_deploy_container(configuration, deployer, build_context_pool, container, containers, skip_build, force_restart, skip_force_restart)
-      end
+    update_crontab_redeploy_rules(configuration, build_servers.first)
 
-      Thread
-        .list
-        .each { |t| t.join if t != Thread.current }
+    containers.uniq.each do |container|
+      recursively_deploy_container(
+        configuration, 
+        deployer, 
+        build_context_pool, 
+        container, 
+        containers, 
+        deployment_policy.skip_build, 
+        deployment_policy.skip_deploy, 
+        deployment_policy.force_restart, 
+        deployment_policy.skip_force_restart
+      )
     end
 
-    @global_logger.info("Deployment finished".green)
-    @global_logger.info("Total time taken: #{time.round}s".green)
+    Thread
+      .list
+      .each { |t| t.join if t != Thread.current }
   ensure
     build_context_pool.close_sessions if build_context_pool
     deployer.close_sessions if deployer
@@ -111,23 +128,18 @@ class Indocker::ConfigurationDeployer
     end
   end
 
-  def preload_containers(configuration)
-    configuration.enabled_containers.each do |container_name|
-      path = Indocker.container_files[container_name]
-      require path
-    end
-  end
-
-  def find_deploy_containers(configuration, deploy_containers, deploy_tags, skip_dependent, skip_containers, servers, skip_tags, auto_confirm, require_confirmation)
+  def find_containers_to_deploy(configuration, deployment_policy)
+    load_enabled_containers(configuration)
+    
     containers = []
 
-    deploy_tags.each do |tag|
+    deployment_policy.deploy_tags.each do |tag|
       containers += configuration.containers.select do |container|
         container.tags.include?(tag)
       end
     end
 
-    skip_containers.each do |name|
+    deployment_policy.skip_containers.each do |name|
       container = configuration.containers.detect do |container|
         container.name == name
       end
@@ -144,7 +156,7 @@ class Indocker::ConfigurationDeployer
       end
     end
 
-    deploy_containers.each do |name|
+    deployment_policy.deploy_containers.each do |name|
       container = configuration.containers.detect do |container|
         container.name == name
       end
@@ -158,17 +170,17 @@ class Indocker::ConfigurationDeployer
       end
     end
 
-    if deploy_tags.empty? && deploy_containers.empty?
+    if deployment_policy.deploy_tags.empty? && deployment_policy.deploy_containers.empty?
       containers = configuration.containers.select do |container|
         configuration.enabled_containers.include?(container.name)
       end
     end
 
-    if !skip_dependent
+    if !deployment_policy.skip_dependent
       containers = collect_dependent_containers(containers)
     end
 
-    if !skip_dependent
+    if !deployment_policy.skip_dependent
       containers = collect_soft_dependent_containers(containers, configuration)
     end
 
@@ -181,13 +193,13 @@ class Indocker::ConfigurationDeployer
 
     containers = containers
       .select { |container| configuration.container_enabled?(container) }
-      .select { |container| !skip_containers.include?(container.name) }
+      .select { |container| !deployment_policy.skip_containers.include?(container.name) }
       .select { |container|
-        (skip_tags & container.tags).empty?
+        (deployment_policy.skip_tags & container.tags).empty?
       }
 
-    if !servers.empty?
-      containers = containers.select {|c| !(c.servers.map(&:name) & servers).empty? }
+    if !deployment_policy.servers.empty?
+      containers = containers.select {|c| !(c.servers.map(&:name) & deployment_policy.servers).empty? }
     end
 
     if containers.empty?
@@ -196,6 +208,7 @@ class Indocker::ConfigurationDeployer
     else
       @global_logger.info("Following containers will be deployed:")
 
+      servers = deployment_policy.servers
       if servers.empty?
         servers = containers.map(&:servers).flatten.uniq.map(&:name)
       end
@@ -213,7 +226,7 @@ class Indocker::ConfigurationDeployer
         end
       end
 
-      if (require_confirmation || configuration.confirm_deployment) && !auto_confirm
+      if (deployment_policy.require_confirmation || configuration.confirm_deployment) && !deployment_policy.auto_confirm
         @global_logger.info("\n")
         @global_logger.info("Do you want to continue deployment? (y or n)")
         result = gets.chomp
@@ -224,7 +237,14 @@ class Indocker::ConfigurationDeployer
         end
       end
 
-      containers
+      containers.uniq {|c| c.name}
+    end
+  end
+
+  def load_enabled_containers(configuration)
+    configuration.enabled_containers.each do |container_name|
+      path = Indocker.container_files[container_name]
+      require path
     end
   end
 
@@ -285,9 +305,21 @@ class Indocker::ConfigurationDeployer
     build_context.set_compiled(image)
   end
 
-  def recursively_deploy_container(configuration, deployer, build_context_pool, container, containers, skip_build, force_restart, skip_force_restart)
+  def recursively_deploy_container(configuration, deployer, build_context_pool, container, 
+    containers, skip_build, skip_deploy, force_restart, skip_force_restart)
+
     container.dependent_containers.each do |container|
-      recursively_deploy_container(configuration, deployer, build_context_pool, container, containers, skip_build, force_restart, skip_force_restart)
+      recursively_deploy_container(
+        configuration, 
+        deployer, 
+        build_context_pool, 
+        container, 
+        containers, 
+        skip_build, 
+        skip_deploy,
+        force_restart, 
+        skip_force_restart
+      )
     end
 
     return if !containers.include?(container)
@@ -304,7 +336,9 @@ class Indocker::ConfigurationDeployer
 
     @progress.finish_building_container(container)
 
-    deployer.deploy(container, force_restart, skip_force_restart, @progress)
+    if !skip_deploy
+      deployer.deploy(container, force_restart, skip_force_restart, @progress)
+    end
   end
 
   class RemoteOperation
@@ -319,7 +353,6 @@ class Indocker::ConfigurationDeployer
   end
 
   def pull_repositories(clonner, servers, repositories)
-    @logger.info("{timestamp}")
     @logger.info("Clonning/pulling repositories")
 
     remote_operations = []
@@ -372,7 +405,6 @@ class Indocker::ConfigurationDeployer
   end
 
   def sync_artifacts(clonner, artifact_servers)
-    @logger.info("{timestamp}")
     @logger.info("Syncing git artifacts")
 
     remote_operations = []
@@ -424,8 +456,6 @@ class Indocker::ConfigurationDeployer
     redeploy_containers = configuration.containers.select {|c| c.redeploy_schedule}.uniq
     return if redeploy_containers.empty?
 
-    @logger.info("{timestamp}")
-
     deploy_user       = "#{server.user}@#{server.host}"
     crontab_filepath  = Indocker.redeploy_crontab_path
 
@@ -450,8 +480,6 @@ class Indocker::ConfigurationDeployer
   end
 
   def sync_indocker(servers)
-    @logger.info("{timestamp}")
-
     servers.map do |server|
       @progress.start_syncing_binaries(server)
 
@@ -482,8 +510,6 @@ class Indocker::ConfigurationDeployer
   end
 
   def sync_env_files(servers, env_files)
-    @logger.info("{timestamp}")
-
     remote_operations = []
 
     servers.map do |server|

data/lib/indocker/container_deployer.rb

@@ -14,6 +14,10 @@ class Indocker::ContainerDeployer
     @deployed_servers = {}
   end
 
+  def create_sessions!
+    @server_pool.create_sessions!
+  end
+
   def deploy(container, force_restart, skip_force_restart, progress)
     return if @deployed_containers[container]
 
@@ -34,7 +38,6 @@ class Indocker::ContainerDeployer
 
       exec_proc.call do
         deploy_context = @server_pool.get(server)
-        @logger.info("{timestamp}")
         @logger.info("Deploying container: #{container.name.to_s.green} to #{server.user}@#{server.host}")
 
         command_output  = @logger.debug? ? "" : " > /dev/null"

data/lib/indocker/deploy_context.rb

@@ -9,15 +9,17 @@ class Indocker::DeployContext
     @configuration = configuration
     @server = server
     @restart_policy = Indocker::Containers::RestartPolicy.new(configuration, logger)
+  end
 
-    if server
-      @session = Indocker::SshSession.new(
-        host: server.host,
-        user: server.user,
-        port: server.port,
-        logger: @logger
-      )
-    end
+  def create_session!
+    return unless @server
+    
+    @session = Indocker::SshSession.new(
+      host: @server.host,
+      user: @server.user,
+      port: @server.port,
+      logger: @logger
+    )
   end
 
   def exec!(command)

data/lib/indocker/deployment_policy.rb

@@ -0,0 +1,22 @@
+class Indocker::DeploymentPolicy
+  attr_reader  :deploy_containers, :deploy_tags, :servers, 
+               :skip_dependent, :skip_tags, :skip_containers, :skip_build, :skip_deploy, 
+               :force_restart, :skip_force_restart, :auto_confirm, :require_confirmation
+
+  def initialize(deploy_containers:, deploy_tags:, servers:, 
+                skip_dependent:, skip_tags:, skip_containers:, skip_build:, skip_deploy:, 
+                force_restart:, skip_force_restart:, auto_confirm:, require_confirmation:)
+    @deploy_containers = deploy_containers
+    @deploy_tags = deploy_tags
+    @servers = servers
+    @skip_dependent = skip_dependent
+    @skip_tags = skip_tags
+    @skip_containers = skip_containers
+    @skip_build = skip_build
+    @skip_deploy = skip_deploy
+    @force_restart = force_restart
+    @skip_force_restart = skip_force_restart
+    @auto_confirm = auto_confirm
+    @require_confirmation = require_confirmation
+  end
+end

data/lib/indocker/deployment_progress.rb

@@ -70,9 +70,10 @@ class Indocker::DeploymentProgress
   end
 
   def setup(binaries_servers:, build_servers:, deploy_servers:, env_files:, artifact_servers:,
-            repositories:, force_restart:, skip_build:, containers:)
+            repositories:, force_restart:, skip_build:, skip_deploy:, containers:)
     @force_restart = force_restart
-    @skip_build = skip_build
+    @skip_build    = skip_build
+    @skip_deploy   = skip_deploy
 
     binaries_servers.each do |server|
       @synced_binaries[server] = {
@@ -250,6 +251,10 @@ class Indocker::DeploymentProgress
       @logger.info("Warning: Image build is skipped for all containers".purple)
     end
 
+    if @skip_deploy
+      @logger.info("Warning: All container deployment is skipped".purple)
+    end
+
     if @force_restart
       @logger.info("Warning: All containers will be force restarted".purple)
     end

data/lib/indocker/images_compiler.rb

@@ -9,7 +9,8 @@ class Indocker::ImagesCompiler
     build_context = Indocker::BuildContext.new(
       configuration: configuration,
       build_server:  nil,
-      logger: Indocker.logger
+      logger: @logger,
+      global_logger: Indocker.global_logger
     )
 
     image_compiler = Indocker::Images::ImageCompiler.new

data/lib/indocker/logger_factory.rb

@@ -0,0 +1,37 @@
+class Indocker::LoggerFactory
+  class << self
+    def create(stdout, level = nil)
+      logger = Logger.new(stdout)
+
+      logger.level = level || Logger::INFO
+
+      logger.formatter = proc do |severity, datetime, progname, msg|
+        level = Logger::SEV_LABEL.index(severity)
+
+        severity = case level
+        when Logger::INFO
+          severity.green
+        when Logger::WARN
+          severity.purple
+        when Logger::DEBUG
+          severity.yellow
+        when Logger::ERROR
+          severity.red
+        when Logger::FATAL
+          severity.red
+        else
+          severity
+        end
+
+        severity = severity.downcase
+        if logger.debug?
+          "#{datetime.strftime("%Y/%m/%d %H:%M:%S")} #{severity}: #{msg}\n"
+        else
+          "  #{severity}: #{msg}\n"
+        end
+      end
+
+      logger
+    end
+  end
+end

data/lib/indocker/server_pool.rb

@@ -12,12 +12,20 @@ class Indocker::ServerPool
     end
   end
 
+  def create_sessions!
+    @contexts.each(&:create_session!)
+  end
+
+  # NOTE: get is a bad name here, because we create a new connection.
+  # TODO: why we create a new connection here?
   def get(server)
-    Indocker::DeployContext.new(
+    context = Indocker::DeployContext.new(
       logger: @logger,
       configuration: @configuration,
       server: server,
     )
+    context.create_session!
+    context
   end
 
   def each(&proc)

data/lib/indocker/ssh_session.rb

@@ -38,10 +38,26 @@ class Indocker::SshSession
   end
 
   def exec!(command)
-    if !@ssh
+    if local?
+      exec_locally!(command)
+    else
+      exec_remotely!(command)
+    end
+  end
+
+  def close
+    if @ssh
+      @ssh.close
+    end
+  end
+
+  private
+    def exec_locally!(command)
       res = Indocker::Shell.command_with_result(command, @logger, skip_logging: false)
       ExecResult.new(res.stdout, '', res.exit_status, nil)
-    else
+    end
+
+    def exec_remotely!(command)
       if Indocker.export_command
         command = "#{Indocker.export_command} && #{command}"
       end
@@ -82,11 +98,4 @@ class Indocker::SshSession
 
       ExecResult.new(stdout_data, stderr_data, exit_code, exit_signal)
     end
-  end
-
-  def close
-    if @ssh
-      @ssh.close
-    end
-  end
 end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.7"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -88,15 +88,28 @@ files:
 - example/indocker/bin/remote/compile
 - example/indocker/bin/remote/run
 - example/indocker/bin/utils/configurations.rb
+- example/indocker/bounded_contexts/shared/bad_container_build/Dockerfile
+- example/indocker/bounded_contexts/shared/bad_container_build/container.rb
+- example/indocker/bounded_contexts/shared/bad_container_build/image.rb
+- example/indocker/bounded_contexts/shared/bad_container_start/Dockerfile
+- example/indocker/bounded_contexts/shared/bad_container_start/build_context/bin/run
+- example/indocker/bounded_contexts/shared/bad_container_start/container.rb
+- example/indocker/bounded_contexts/shared/bad_container_start/image.rb
+- example/indocker/bounded_contexts/shared/good_container/Dockerfile
+- example/indocker/bounded_contexts/shared/good_container/container.rb
+- example/indocker/bounded_contexts/shared/good_container/image.rb
 - example/indocker/bounded_contexts/shared/ruby/Dockerfile
 - example/indocker/bounded_contexts/shared/ruby/container.rb
 - example/indocker/bounded_contexts/shared/ruby/image.rb
 - example/indocker/configurations/dev.rb
+- example/indocker/configurations/external.rb
 - example/indocker/infrastructure/build_servers.rb
 - example/indocker/infrastructure/networks.rb
 - example/indocker/infrastructure/registries.rb
 - example/indocker/infrastructure/servers.rb
 - example/indocker/setup.rb
+- example/spec/indocker_spec.rb
+- example/spec/spec_helper.rb
 - indocker.gemspec
 - lib/indocker.rb
 - lib/indocker/artifacts/git.rb
@@ -120,6 +133,7 @@ files:
 - lib/indocker/crontab_redeploy_rules_builder.rb
 - lib/indocker/deploy_context.rb
 - lib/indocker/deployment_checker.rb
+- lib/indocker/deployment_policy.rb
 - lib/indocker/deployment_progress.rb
 - lib/indocker/docker.rb
 - lib/indocker/docker_run_args.rb
@@ -134,6 +148,7 @@ files:
 - lib/indocker/images/templates_compiler.rb
 - lib/indocker/images_compiler.rb
 - lib/indocker/indocker_helper.rb
+- lib/indocker/logger_factory.rb
 - lib/indocker/network.rb
 - lib/indocker/network_helper.rb
 - lib/indocker/registries/abstract.rb