indocker 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0356e417ece7294e5a5185f7cf17313d3b8f47c74895fdf0323989da110d5569
-  data.tar.gz: a2c04c1b66f98aa172b758be94e522901dffb2bef4d472602d70742fd93d80be
+  metadata.gz: cacf753d2ac5b563b097493cdb495f76b2d1aef8f758dea6d84a3791e36ab0aa
+  data.tar.gz: bbd59aec061d7358c3d5a579615547c3a3c097219069d93bbd7e78563f31b091
 SHA512:
-  metadata.gz: 38376ede23d5ce780f0234ec01f473d673b4bdfe5a2ef4e893fcf867420ae8a11bbe57df6f010d1f87289f2c970328f8bc86f1b0cde929c73c1129b4bfb0d591
-  data.tar.gz: 93bb3bb739fbc427e8c688e7da395088d6e60fafa68c0741d91706bc2ac50bee9fae80b7ff240be16f4c4b5e7985b9f8fa4b56c9e1e74ccd6aa036f8d9bad021
+  metadata.gz: f57b65eb2d10ae48aef8295db38822e3d2f55f11d04e912628884b8bbf3e88ff60d95453c086ea4352e1cd0c3d35e4c51682e1dda7bf3e7826502e36c0b27ec9
+  data.tar.gz: a3732e6bc974c22b3dd5f856c593054d300d1d6244ac5399cb43d9cdd896940aa9089d0240ce5c8f83481a9e3b51507227d1c4510b66563025b6b5266f56491c

data/.ruby-version

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

data/Gemfile

@@ -6,6 +6,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :test do
-  gem 'rspec'
   gem 'pry'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.9)
+    indocker (0.1.14)
       net-ssh
 
 GEM
@@ -9,12 +9,13 @@ GEM
   specs:
     coderay (1.1.3)
     diff-lcs (1.3)
+    docile (1.3.2)
     method_source (1.0.0)
     net-ssh (6.1.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (10.5.0)
+    rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -28,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
@@ -36,8 +41,9 @@ DEPENDENCIES
   bundler (~> 1.17)
   indocker!
   pry
-  rake (~> 10.0)
-  rspec
+  rake (~> 12.3.3)
+  rspec (~> 3.0)
+  simplecov (~> 0.18.5)
 
 BUNDLED WITH
    1.17.3

data/example/indocker/bounded_contexts/shared/{container_failing_build → bad_container_build}/Dockerfile

@@ -1,4 +1,3 @@
 FROM ruby:2.5.0
 
 RUN some-unexisting-command
-WORKDIR /app

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

@@ -6,7 +6,18 @@ Indocker
     ruby: {
       servers: [:external],
     },
-    container_failing_build: {
+    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/setup.rb

@@ -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,30 +62,41 @@ 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'
@@ -172,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
@@ -340,7 +352,7 @@ module Indocker
         require_confirmation: require_confirmation,
       )
 
-      Indocker::ConfigurationDeployer
+      Indocker::Launchers::ConfigurationDeployer
         .new(logger: Indocker.logger, global_logger: Indocker.global_logger)
         .run(
           configuration:     configuration,
@@ -369,7 +381,7 @@ module Indocker
     end
 
     def compile(images:, skip_dependent:)
-      Indocker::ImagesCompiler
+      Indocker::Launchers::ImagesCompiler
         .new(Indocker.logger)
         .compile(
           configuration: configuration,
@@ -379,7 +391,7 @@ module Indocker
     end
 
     def run(container_name, force_restart)
-      Indocker::ContainerRunner
+      Indocker::Launchers::ContainerRunner
         .new(Indocker.logger)
         .run(
           configuration: configuration,

data/lib/indocker/build_context.rb

@@ -1,55 +1,18 @@
 require 'fileutils'
 
 class Indocker::BuildContext
-  attr_reader :session, :server, :configuration, :helper, :logger
+  attr_reader :configuration, :logger, :global_logger, :helper
 
-  def initialize(configuration:, build_server:, logger:, global_logger:)
+  def initialize(configuration:, 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
-
-  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)
-    @session.exec!(command)
-  end
-
-  def close_session
-    @session.close if @session
-  end
-
-  def image_compiled?(image)
-    @compiled_images[image]
-  end
-
-  def set_busy(flag)
-    @busy = !!flag
-  end
-
-  def busy?
-    !!@busy
-  end
-
-  def set_compiled(image)
-    @compiled_images[image] = true
   end
 
   def build_image(image, build_dir, args: [])
     image_name = image.image_name
-    registry = image.registry
+    registry   = image.registry
     tag        = image.tag
 
     FileUtils.cd(build_dir) do
@@ -79,7 +42,9 @@ class Indocker::BuildContext
       end
 
       Indocker::Docker.tag(image.local_registry_url, image.registry_url)
-      Indocker::Docker.tag(image.local_registry_url, image.local_registry_url)
+      if image.registry_url != image.local_registry_url
+        Indocker::Docker.tag(image.local_registry_url, image.local_registry_url)
+      end
 
       if !image.registry.is_local?
         Indocker::Docker.push(image.registry_url)

data/lib/indocker/container_deployer.rb

@@ -5,7 +5,7 @@ class Indocker::ContainerDeployer
     @configuration = configuration
     @logger = logger
 
-    @server_pool = Indocker::ServerPool.new(
+    @server_pool = Indocker::ServerPools::DeployServerPool.new(
       configuration: @configuration,
       logger: logger
     )
@@ -14,10 +14,6 @@ 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]
 
@@ -37,30 +33,23 @@ class Indocker::ContainerDeployer
       end
 
       exec_proc.call do
-        deploy_context = @server_pool.get(server)
+        deploy_server = @server_pool.create_connection!(server)
         @logger.info("Deploying container: #{container.name.to_s.green} to #{server.user}@#{server.host}")
 
-        command_output  = @logger.debug? ? "" : " > /dev/null"
-        debug_options   = @logger.debug? ? "-d" : ""
-
-        if force_restart && !skip_force_restart.include?(container.name)
-          force_restart_options = force_restart ? "-f" : ""
-        end
-
-        result = deploy_context
-          .session
-          .exec!(
-            "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/run -C #{Indocker.configuration_name} -c #{container.name} #{debug_options} #{command_output} #{force_restart_options}"
+        result = deploy_server
+          .run_container_remotely(
+            configuration_name: Indocker.configuration_name,
+            container_name:     container.name,
+            force_restart:      force_restart && !skip_force_restart.include?(container.name)
           )
 
-        Indocker::SshResultLogger
-          .new(@logger)
-          .log(result, "#{container.name.to_s.green} deployment for server #{server.name} failed")
-
-        exit 1 if result.exit_code != 0
+        if result.exit_code != 0
+          exit 1 
+        end
+        
         @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
 
-        deploy_context.close_session
+        deploy_server.close_session
         progress.finish_deploying_container(container, server)
       end
     end

data/lib/indocker/crontab_redeploy_rules_builder.rb

@@ -8,7 +8,7 @@ PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
   CRONTAB
 
   LOG_FILE      = "/var/log/indocker-redeploy-%{env}.log"
-  COMMAND       = "export TERM=xterm;#{Indocker.deploy_dir}/indocker/bin/deploy -C %{env} -f -B -y -c %{container_name}"
+  COMMAND       = "export TERM=xterm;%{deploy_dir}/indocker/bin/deploy -C %{env} -f -B -y -c %{container_name}"
   REDEPLOY_RULE = %Q{%{schedule} echo `date` "- %{command}..." >> %{log_file}; %{command} 1>/dev/null 2>>%{log_file}; echo `date` "- done, exitcode = $?" >> %{log_file}}
 
   def initialize(configuration:, logger:)
@@ -41,6 +41,7 @@ PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
     COMMAND % {
       env:            env,
       container_name: container.name,
+      deploy_dir: Indocker.deploy_dir
     }
   end