indocker 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26827edabc3dcae5d27465689bcfa96fc00f7649eecb978af3f766dbf834a78
-  data.tar.gz: 30bcfaa047bc22995b77cb695ff58d7624d6a3702b97c99df900bbaddd3e9e18
+  metadata.gz: 405310bd24a8adfa838f82a3cac79f2fa125083ebcb4cf788d27332875d52353
+  data.tar.gz: 12103e2edb743e5024f50496962883f271c095bcd6264934c3295309fbf8e762
 SHA512:
-  metadata.gz: 8c518149fae3e281c98d1620abc68cb192c741843dd583121e0e6cc3c7b24802fe33d5ebf8b257677fba77b64ce052a474d73b9a9efdb9045222d64f34d9f266
-  data.tar.gz: 1ca41ab244943db566081ac81efdf1ffb0f4a886ce480b39e8d55c595757de249df2c33321ab82a1cee6f0807695ad827cf7218907420802087066b7125b5099
+  metadata.gz: fd602a0202c99b48303ee69a129b9f8cbfa9d621a7d2ea3f84b1446613ed8210b7ad103005967ce0459407a49482fcababf1b72f27254b1e6d5fcc29175c2ceb
+  data.tar.gz: 67f12a6d6b2715bde6034dbbc1b6e0a2c42bcc7c27a5e66fe40bde489db8f50cd42fb1805e03e04e35a76dd9a1f82bb754e942beba68a9fba5a4751614644dbb

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.2)
+    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/lib/indocker/configuration_deployer.rb

@@ -67,13 +67,15 @@ class Indocker::ConfigurationDeployer
       )
 
       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)
@@ -380,33 +382,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/repositories/clonner.rb

@@ -10,6 +10,8 @@ class Indocker::Repositories::Clonner
     raise ArgumenError.new("only git repositories should be clonned") if !repository.is_git?
 
     session.exec!("rm -rf #{repository.clone_path} && mkdir -p #{repository.clone_path}")
-    session.exec!("git clone -b #{repository.branch} --depth 1 #{repository.remote_url} #{repository.clone_path}")
+    
+    git_command = "git clone -b #{repository.branch} --depth 1 #{repository.remote_url} #{repository.clone_path}"
+    session.exec!("ssh-agent bash -c 'ssh-add ~/.ssh/#{repository.ssh_key}; #{git_command}'")
   end
 end

data/lib/indocker/repositories/git.rb

@@ -1,13 +1,16 @@
 class Indocker::Repositories::Git < Indocker::Repositories::Abstract
-  attr_reader :remote_url, :remote_name, :email, :password, :branch
+  attr_reader :remote_url, :remote_name, :email, :password, :branch, :ssh_key
 
-  def setup(remote_name:, remote_url:, email: nil, password: nil, branch:, clone_path: nil)
+  DEFAULT_SSH_KEY = "id_rsa"
+
+  def setup(remote_name:, remote_url:, email: nil, password: nil, branch:, clone_path: nil, ssh_key: DEFAULT_SSH_KEY)
     @remote_name = remote_name
     @remote_url = remote_url
     @email = email
     @password = password
     @branch = branch
     @clone_path = clone_path
+    @ssh_key = ssh_key
     self
   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.2"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -159,7 +159,7 @@ homepage: https://github.com/ArtStation/indocker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Docker Containers Deployment
 test_files: []