indocker 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9667ebbc4e293dd51830ec7cae6c57455fe1b59b09722e094d76fa934564001
-  data.tar.gz: 4912748b481273ba9cc7a69e11698ebfc14cd01d942550bb7f67f014df0b1a46
+  metadata.gz: dbe3ccb46e2212e0f4792ff6d528e3da20efbcf793c519b29dc76bd3cf1f2393
+  data.tar.gz: a7971075ca1ce8febaef30db0217c9d353536fc2f0f792def4fbf898ba68333c
 SHA512:
-  metadata.gz: 553570ec945812578c4a3cfc1744e5455c8e18e584cc2bb0bed4f70227d751329d147c04d07858f0bd26390f3725eb7bed2ce6f5fab4e34ee3731e065cc54499
-  data.tar.gz: f1b46f64d4be12e0d62de23623fc3aac49fc0f10246effe8868fde2d9721d6105776ca7d06edd3e8e9d368352882125720915ca81ab2952e0e1feecd0eab51e3
+  metadata.gz: c7f1a7abced7f6fcf440218bd407714e4a8f53f897d752218493ee3162193a8cdf2eeadd5a204bc8c03b9c263617dd0d97b7f09ede7818bdb79638a61d7aabc8
+  data.tar.gz: e51552f9e3de3a1a27b028e74a4ea6d00efe04db6ca31e59a15cc323e49374f48968ea00b94f4147debff6696ac8a88ba317a59e85f4d8ce1d6ccd6ff2641839

data/.ruby-version

@@ -0,0 +1 @@
+2.5.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,15 +1,21 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.7)
+    indocker (0.1.13)
       net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.3)
+    docile (1.3.2)
+    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)
@@ -23,6 +29,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
 
 PLATFORMS
   ruby
@@ -30,8 +40,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   indocker!
-  rake (~> 10.0)
+  pry
+  rake (~> 12.3.3)
   rspec (~> 3.0)
+  simplecov (~> 0.18.5)
 
 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/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,6 @@
+Indocker
+  .define_container(:bad_container_build)
+  .tags('bad_container_build', 'console=true')
+  .image(:bad_container_build)
+  .networks(:app_net)
+  .daemonize(false)

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,6 @@
+Indocker
+  .define_container(:bad_container_start)
+  .tags('bad_container_start', 'console=true')
+  .image(:bad_container_start)
+  .networks(:app_net)
+  .daemonize(false)

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/daemon_container/Dockerfile

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

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

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

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

@@ -0,0 +1,3 @@
+Indocker
+  .define_image(:daemon_container)
+  .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,6 @@
+Indocker
+  .define_container(:good_container)
+  .tags('good_container', 'console=true')
+  .image(:good_container)
+  .networks(:app_net)
+  .daemonize(false)

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

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

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

@@ -2,4 +2,5 @@ Indocker
   .define_container(:ruby)
   .tags('ruby', 'console=true')
   .image(:ruby)
-  .networks(:app_net)
+  .networks(:app_net)
+  .daemonize(false)

data/example/indocker/configurations/external.rb

@@ -0,0 +1,23 @@
+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],
+    },
+    daemon_container: {
+      servers: [:external],
+    }
+  ).artifacts(
+    indocker_readme: [:external],
+  )

data/example/indocker/infrastructure/artifacts.rb

@@ -0,0 +1,10 @@
+Indocker.add_artifact(
+  Indocker::Artifacts::Git.new(
+    name:        :indocker_readme,
+    remote_name: 'origin',
+    remote_url:  'https://github.com/ArtStation/indocker.git',
+    branch:      :master,
+    source_path: './README.md',
+    target_path: File.join(Indocker.deploy_dir, 'README.md'),
+  )
+)

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',
@@ -18,6 +18,7 @@ require_relative 'infrastructure/registries'
 require_relative 'infrastructure/servers'
 require_relative 'infrastructure/build_servers'
 require_relative 'infrastructure/networks'
+require_relative 'infrastructure/artifacts'
 
 Indocker.set_bounded_contexts_dir(File.join(__dir__, 'bounded_contexts'))
 

data/indocker.gemspec

@@ -25,6 +25,7 @@ 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"
+  spec.add_development_dependency "simplecov", "~> 0.18.5"
 end

data/lib/indocker.rb

@@ -50,6 +50,7 @@ module Indocker
     autoload :Local, 'volumes/local'
     autoload :External, 'volumes/external'
     autoload :Repository, 'volumes/repository'
+    autoload :VolumeHelper, 'volumes/volume_helper'
   end
 
   module EnvFiles
@@ -61,34 +62,47 @@ module Indocker
     autoload :Git, 'artifacts/git'
   end
 
+  module Networks
+    autoload :Network, 'networks/network'
+    autoload :NetworkHelper, 'networks/network_helper'
+  end
+
+  module Launchers
+    autoload :ConfigurationDeployer, 'launchers/configuration_deployer'
+    autoload :ImagesCompiler, 'launchers/images_compiler'
+    autoload :ContainerRunner, 'launchers/container_runner'
+  end
+
+  module ServerPools
+    autoload :ServerConnection, 'server_pools/server_connection'
+    autoload :DeployServerPool, 'server_pools/deploy_server_pool'
+    autoload :DeployServerConnection, 'server_pools/deploy_server_connection'
+    autoload :BuildServerPool, 'server_pools/build_server_pool'
+    autoload :BuildServerConnection, 'server_pools/build_server_connection'
+  end
+
   autoload :HashMerger, 'hash_merger'
   autoload :BuildServer, 'build_server'
   autoload :Server, 'server'
-  autoload :ConfigurationDeployer, 'configuration_deployer'
   autoload :SshSession, 'ssh_session'
-  autoload :BuildContextPool, 'build_context_pool'
   autoload :BuildContext, 'build_context'
   autoload :BuildContextHelper, 'build_context_helper'
   autoload :Shell, 'shell'
   autoload :Docker, 'docker'
   autoload :ContextArgs, 'context_args'
-  autoload :Network, 'network'
   autoload :ContainerDeployer, 'container_deployer'
-  autoload :ServerPool, 'server_pool'
   autoload :DeployContext, 'deploy_context'
   autoload :ContainerHelper, 'container_helper'
   autoload :DockerRunArgs, 'docker_run_args'
-  autoload :VolumeHelper, 'volume_helper'
-  autoload :NetworkHelper, 'network_helper'
   autoload :Rsync, 'rsync'
   autoload :EnvFileHelper, 'env_file_helper'
   autoload :IndockerHelper, 'indocker_helper'
-  autoload :ImagesCompiler, 'images_compiler'
-  autoload :ContainerRunner, 'container_runner'
   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)
@@ -170,7 +184,7 @@ module Indocker
         raise ArgumentError.new("network :#{name} was already defined")
       end
 
-      networks.push(Indocker::Network.new(name))
+      networks.push(Indocker::Networks::Network.new(name))
     end
 
     def container_files
@@ -323,22 +337,26 @@ module Indocker
       force_restart: false, skip_force_restart: [], auto_confirm: false, 
       require_confirmation: false)
 
-      Indocker::ConfigurationDeployer
-        .new(Indocker.logger)
+      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::Launchers::ConfigurationDeployer
+        .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,
-          skip_deploy:          skip_deploy,
-          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
 
@@ -363,7 +381,7 @@ module Indocker
     end
 
     def compile(images:, skip_dependent:)
-      Indocker::ImagesCompiler
+      Indocker::Launchers::ImagesCompiler
         .new(Indocker.logger)
         .compile(
           configuration: configuration,
@@ -373,7 +391,7 @@ module Indocker
     end
 
     def run(container_name, force_restart)
-      Indocker::ContainerRunner
+      Indocker::Launchers::ContainerRunner
         .new(Indocker.logger)
         .run(
           configuration: configuration,
@@ -390,56 +408,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