indocker 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c37678a3d0b00e17c7e819b8565f0a4bb9330351a66711da35ab2a4fb6681e
-  data.tar.gz: dc921c4c6839a9b31392a8373f1231c359261d8759eab8566934a221ddcb9d14
+  metadata.gz: d9667ebbc4e293dd51830ec7cae6c57455fe1b59b09722e094d76fa934564001
+  data.tar.gz: 4912748b481273ba9cc7a69e11698ebfc14cd01d942550bb7f67f014df0b1a46
 SHA512:
-  metadata.gz: 78e90ff4a4970faa4e98b968da758e11fe8bcfd391a68f38c9c1c16210b09dbd93c6801e35873e2fa2fc5348af6e6467b3dfb299d4e3e879ef16391f43730504
-  data.tar.gz: f585568265e524e2061bd3e8aab6330c8d4c0a0379ee6a0f4a05ad82dfe6089cbd1624205c98cbfb2df98af80ac81671289e51502f0f1fe45b1fdee1473e605f
+  metadata.gz: 553570ec945812578c4a3cfc1744e5455c8e18e584cc2bb0bed4f70227d751329d147c04d07858f0bd26390f3725eb7bed2ce6f5fab4e34ee3731e065cc54499
+  data.tar.gz: f1b46f64d4be12e0d62de23623fc3aac49fc0f10246effe8868fde2d9721d6105776ca7d06edd3e8e9d368352882125720915ca81ab2952e0e1feecd0eab51e3

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.3)
+    indocker (0.1.7)
       net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    net-ssh (5.2.0)
+    net-ssh (6.1.0)
     rake (10.5.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

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/lib/indocker.rb

@@ -318,21 +318,26 @@ 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)
+
       Indocker::ConfigurationDeployer
         .new(Indocker.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,
+          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,
         )
     end

data/lib/indocker/configuration_deployer.rb

@@ -18,7 +18,8 @@ class Indocker::ConfigurationDeployer
   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:)
+          skip_containers:, servers:, skip_build:, skip_deploy:, force_restart:, skip_force_restart:, 
+          auto_confirm:, require_confirmation:)
     build_context_pool = nil
     deployer = nil
 
@@ -31,6 +32,10 @@ class Indocker::ConfigurationDeployer
         @logger.warn("WARNING. Images build step will be skipped")
       end
 
+      if skip_deploy
+        @logger.warn("WARNING. Images deploy 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)
@@ -56,30 +61,43 @@ class Indocker::ConfigurationDeployer
 
       @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,
+        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,
+        skip_deploy:      skip_deploy,
+        containers:       containers,
         artifact_servers: configuration.artifact_servers,
       )
 
       remote_operations = sync_indocker(servers)
+      wait_remote_operations(remote_operations)
 
+      remote_operations = sync_env_files(deploy_servers, configuration.env_files)
       wait_remote_operations(remote_operations)
 
-      remote_operations += sync_env_files(deploy_servers, configuration.env_files)
-      remote_operations += pull_repositories(clonner, build_servers, configuration.repositories)
-      remote_operations += sync_artifacts(clonner, configuration.artifact_servers)
+      remote_operations = pull_repositories(clonner, build_servers, configuration.repositories)
+      wait_remote_operations(remote_operations)
 
+      remote_operations = sync_artifacts(clonner, configuration.artifact_servers)
       wait_remote_operations(remote_operations)
 
       update_crontab_redeploy_rules(configuration, build_servers.first)
 
       containers.uniq.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
 
       Thread
@@ -283,9 +301,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)
@@ -302,7 +332,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
@@ -380,33 +412,35 @@ class Indocker::ConfigurationDeployer
         @progress.start_syncing_artifact(server, artifact)
 
         thread = Thread.new do
-          session = Indocker::SshSession.new(
-            host: server.host,
-            user: server.user,
-            port: server.port,
-            logger: @logger
-          )
+          server.synchronize do
+            session = Indocker::SshSession.new(
+              host: server.host,
+              user: server.user,
+              port: server.port,
+              logger: @logger
+            )
 
-          @logger.info("Pulling git artifact  #{artifact.name.to_s.green} for #{server.user}@#{server.host}")
-          result = clonner.clone(session, artifact.repository)
+            @logger.info("Pulling git artifact  #{artifact.name.to_s.green} for #{server.user}@#{server.host}")
+            result = clonner.clone(session, artifact.repository)
 
-          if result.exit_code != 0
-            @logger.error("Artifact repository :#{artifact.repository.name} was not clonned")
-            @logger.error(result.stderr_data)
-            exit 1
-          end
+            if result.exit_code != 0
+              @logger.error("Artifact repository :#{artifact.repository.name} was not clonned")
+              @logger.error(result.stderr_data)
+              exit 1
+            end
 
-          source_path = File.join(artifact.repository.clone_path, artifact.source_path)
-          result = session.exec!("mkdir -p #{artifact.target_path}")
-          result = session.exec!("cp -r #{source_path} #{artifact.target_path}")
+            source_path = File.join(artifact.repository.clone_path, artifact.source_path)
+            result = session.exec!("mkdir -p #{artifact.target_path}")
+            result = session.exec!("cp -r #{source_path} #{artifact.target_path}")
 
-          if !result.success?
-            @logger.error(result.stdout_data)
-            @logger.error(result.stderr_data)
-            exit 1
-          end
+            if !result.success?
+              @logger.error(result.stdout_data)
+              @logger.error(result.stderr_data)
+              exit 1
+            end
 
-          @progress.finish_syncing_artifact(server, artifact)
+            @progress.finish_syncing_artifact(server, artifact)
+          end
         end
 
         RemoteOperation.new(thread, server, :artifact_sync)

data/lib/indocker/context_args.rb

@@ -14,9 +14,10 @@ class Indocker::ContextArgs
     end
 
     value = @context_args.fetch(name) do
-      Indocker.logger.error("build arg '#{format_arg(name)}' is not defined#{@container ? " for container :#{@container.name}" : ""}")
-      Indocker.logger.error("available args: #{@context_args.inspect}")
-      exit 1
+      Indocker.logger.warn("build arg '#{format_arg(name)}' is not defined#{@container ? " for container :#{@container.name}" : ""}")
+      Indocker.logger.warn("available args: #{@context_args.inspect}")
+
+      nil
     end
 
     if value.is_a?(Hash)

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/server.rb

@@ -17,4 +17,14 @@ class Indocker::Server
       super
     end
   end
+
+  def synchronize(&block)
+    semaphore.synchronize do
+      block.call if block_given?
+    end
+  end
+
+  def semaphore
+    @semaphore ||= Mutex.new
+  end
 end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.3"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Docker Containers Deployment