indocker 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93eba781605cba8bdb795ed40a03b16d3602508ca427639b42ead50c25b7ec6
-  data.tar.gz: 3e5dc1f5582c8ee45fa4e3583cfea13abf3121e52341eecdc98b8660db700d94
+  metadata.gz: 87f0d247cd6a4aa8f3958d6b9d9aef1dfd879c15651c9e4c01c9e15e7bffe0a0
+  data.tar.gz: e0391bebb9cd04117a68e904caef9ccd72b586fd10a8e2ba02b3673b389de8de
 SHA512:
-  metadata.gz: 4da7e1049911e4d0c12d89d977cfb568687f61568866ec82f737694c1023984ad97d205d25eaa35e19ebc46843d0743d1df07c833c48d293a5c10ca5de0fd792
-  data.tar.gz: 1a8205455ebf5da34c8039a87c45772807920e362e8814bee275ef578647a15edf9970a9c53196b5805aeba8d4b3b047e30e329b0637d393a390c9d32c68353f
+  metadata.gz: baad11d2671bb96f35cfed12ca80ac713d135ee19a4b8e7222ab91685a9f5efd65a84d539425cc68e7f786eca689e451b46ea2e503569037b080aee422f01fe2
+  data.tar.gz: 876a4b96e5a96f7a1f9ffff7138597e413739a84c4bc1dbe8b0adb18073e431ecef0da966b7c7bf861d3f6792de8ec21e43f5970aae6ccb3b5813b095700a787

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.16)
+    indocker (0.1.17)
       net-ssh
 
 GEM

data/example/indocker/bin/deploy

@@ -94,12 +94,9 @@ if !configurations.include?(options[:configuration])
   exit 1
 end
 
-begin
-  require 'indocker'
-rescue LoadError
-  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
-  exit
-end
+require 'rubygems'
+require 'bundler/setup'
+require 'indocker'
 
 if options[:debug]
   Indocker.set_log_level(Logger::DEBUG)

data/example/indocker/bin/remote/compile

@@ -49,12 +49,8 @@ if !options.has_key?(:images)
   puts "At least one image should be provided"
 end
 
-begin
-  require 'indocker'
-rescue LoadError
-  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
-  exit 1
-end
+require 'rubygems'
+require 'indocker'
 
 if options[:debug]
   Indocker.set_log_level(Logger::DEBUG)

data/example/indocker/bin/remote/run

@@ -46,12 +46,8 @@ if !configurations.include?(options[:configuration])
   exit 1
 end
 
-begin
-  require 'indocker'
-rescue LoadError
-  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
-  exit 1
-end
+require 'rubygems'
+require 'indocker'
 
 if options[:debug]
   Indocker.set_log_level(Logger::DEBUG)

data/example/indocker/bounded_contexts/good_containers/daemon_container/Dockerfile

@@ -0,0 +1 @@
+FROM <%= image_url(:parent_image) %>

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

@@ -0,0 +1,4 @@
+Indocker
+  .define_image(:daemon_container)
+  .depends_on(:parent_image)
+  .registry(:default)

data/example/indocker/bounded_contexts/good_containers/dependency_container/Dockerfile

@@ -0,0 +1 @@
+FROM <%= image_url(:parent_image) %>

data/example/indocker/bounded_contexts/good_containers/dependency_container/container.rb

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

data/example/indocker/bounded_contexts/good_containers/dependency_container/image.rb

@@ -0,0 +1,4 @@
+Indocker
+  .define_image(:dependency_container)
+  .depends_on(:parent_image)
+  .registry(:default)

data/example/indocker/bounded_contexts/good_containers/good_container/Dockerfile

@@ -0,0 +1,3 @@
+FROM <%= image_url(:parent_image) %>
+
+COPY example_file.txt example_file.txt

data/example/indocker/bounded_contexts/good_containers/good_container/build_context/example_file.txt

@@ -0,0 +1,2 @@
+domain: <%= global_build_args.domain %>
+hostname: <%= containers.good_container.hostname %>

data/example/indocker/bounded_contexts/{shared → good_containers}/good_container/container.rb

@@ -1,6 +1,10 @@
 Indocker
   .define_container(:good_container)
+  .depends_on(:dependency_container)
   .tags('good_container', 'console=true')
   .image(:good_container)
   .networks(:app_net)
-  .daemonize(false)
+  .daemonize(false)
+  # .start({
+  #   env_files: [:default_env],
+  # })

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

@@ -0,0 +1,4 @@
+Indocker
+  .define_image(:good_container)
+  .depends_on(:parent_image)
+  .registry(:default)

data/example/indocker/bounded_contexts/shared/{good_container → parent_image}/Dockerfile

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

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

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

data/example/indocker/configurations/external.rb

@@ -2,6 +2,10 @@ Indocker
   .build_configuration(:external)
   .use_registry(:dev, as: :default)
   .use_build_server(:external_bs)
+  .global_build_args({
+    domain: 'indocker.me',
+  })
+  .use_env_file(:development_env, as: :default_env)
   .enabled_containers(
     ruby: {
       servers: [:external],
@@ -20,4 +24,5 @@ Indocker
     }
   ).artifacts(
     indocker_readme: [:external],
+    hosts_file: [:external],
   )

data/example/indocker/env_files/development_env.env

@@ -0,0 +1 @@
+PROJECT_NAME=indocker

data/example/indocker/infrastructure/artifacts.rb

@@ -4,7 +4,23 @@ Indocker.add_artifact(
     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'),
+    files: [
+      Indocker::Artifacts::DTO::FileDTO.new(
+        source_path: './README.md',
+        target_path: Indocker.deploy_dir,
+      )
+    ]
+  )
+)
+
+Indocker.add_artifact(
+  Indocker::Artifacts::Remote.new(
+    name: :hosts_file,
+    files: [
+      Indocker::Artifacts::DTO::FileDTO.new(
+        source_path: '/etc/hosts',
+        target_path: Indocker.deploy_dir,
+      )
+    ]
   )
 )

data/example/indocker/infrastructure/env_files.rb

@@ -0,0 +1,6 @@
+Indocker.define_env_file(
+  Indocker::EnvFiles::Local.new(
+    :development_env,
+    File.expand_path(File.join(__dir__, '../env_files/development_env.env'))
+  )
+)

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('~/deployment')
+Indocker.set_deploy_dir('~/.indocker-deployment')
 
 Indocker.set_dockerignore [
   'Dockerfile',
@@ -19,6 +19,7 @@ require_relative 'infrastructure/servers'
 require_relative 'infrastructure/build_servers'
 require_relative 'infrastructure/networks'
 require_relative 'infrastructure/artifacts'
+require_relative 'infrastructure/env_files'
 
 Indocker.set_bounded_contexts_dir(File.join(__dir__, 'bounded_contexts'))
 

data/lib/indocker.rb

@@ -10,16 +10,12 @@ module Indocker
     autoload :Git, 'repositories/git'
     autoload :Local, 'repositories/local'
     autoload :NoSync, 'repositories/no_sync'
-    autoload :Clonner, 'repositories/clonner'
+    autoload :Cloner, 'repositories/cloner'
   end
 
   module Configurations
     autoload :Configuration, 'configurations/configuration'
     autoload :ConfigurationBuilder, 'configurations/configuration_builder'
-
-    module Formatters
-      autoload :Stdout, 'configurations/formatters/stdout'
-    end
   end
 
   module Registries
@@ -59,7 +55,17 @@ module Indocker
   end
 
   module Artifacts
+    autoload :Base, 'artifacts/base'
     autoload :Git, 'artifacts/git'
+    autoload :Remote, 'artifacts/remote'
+
+    module DTO
+      autoload :FileDTO, 'artifacts/dto/file_dto'
+    end
+
+    module Services
+      autoload :Synchronizer, 'artifacts/services/synchronizer'
+    end
   end
 
   module Networks
@@ -71,6 +77,10 @@ module Indocker
     autoload :ConfigurationDeployer, 'launchers/configuration_deployer'
     autoload :ImagesCompiler, 'launchers/images_compiler'
     autoload :ContainerRunner, 'launchers/container_runner'
+
+    module DTO
+      autoload :RemoteOperationDTO, 'launchers/dto/remote_operation_dto'
+    end
   end
 
   module ServerPools
@@ -332,9 +342,9 @@ module Indocker
       builder
     end
 
-    def deploy(containers: [], skip_tags: [], tags: [], skip_dependent: 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, 
+      force_restart: false, skip_force_restart: [], auto_confirm: false,
       require_confirmation: false)
 
       deployment_policy = Indocker::DeploymentPolicy.new(

data/lib/indocker/artifacts/base.rb

@@ -0,0 +1,26 @@
+class Indocker::Artifacts::Base
+  def build_source_path(*args)
+    raise StandardError.new('not implemented')
+  end
+
+  def is_git?
+    false
+  end
+
+  private
+
+    def build_all_files(files: [], source_path: nil, target_path: nil)
+      all_files = files
+
+      if source_path && target_path
+        all_files.push(
+          Indocker::Artifacts::DTO::FileDTO.new(
+            source_path: source_path,
+            target_path: target_path,
+          )
+        )
+      end
+
+      all_files
+    end
+end

data/lib/indocker/artifacts/dto/file_dto.rb

@@ -0,0 +1,8 @@
+class Indocker::Artifacts::DTO::FileDTO
+  attr_reader :source_path, :target_path
+
+  def initialize(source_path:, target_path:)
+    @source_path = source_path
+    @target_path = target_path
+  end
+end

data/lib/indocker/artifacts/git.rb

@@ -1,13 +1,17 @@
-class Indocker::Artifacts::Git
-  attr_reader :name, :remote_name, :remote_url, :branch, :source_path, :target_path
+class Indocker::Artifacts::Git < Indocker::Artifacts::Base
+  attr_reader :name, :remote_name, :remote_url, :branch, :files
 
-  def initialize(name:, remote_name:, remote_url:, branch:, source_path:, target_path:)
+  def initialize(name:, remote_name:, remote_url:, branch:, files: [], source_path: nil, target_path: nil)
     @name        = name
     @remote_name = remote_name
     @remote_url  = remote_url
     @branch      = branch
-    @source_path = source_path
-    @target_path = target_path
+
+    @files = build_all_files(
+      files:       files,
+      source_path: source_path,
+      target_path: target_path,
+    )
   end
 
   def repository
@@ -22,4 +26,12 @@ class Indocker::Artifacts::Git
   def project_name(url)
     url.split('/').last.gsub('.git', '')
   end
+
+  def is_git?
+    true
+  end
+
+  def build_source_path(path)
+    File.join(self.repository.clone_path, path)
+  end
 end

data/lib/indocker/artifacts/remote.rb

@@ -0,0 +1,17 @@
+class Indocker::Artifacts::Remote < Indocker::Artifacts::Base
+  attr_reader :name, :files
+
+  def initialize(name:, files: [], source_path: nil, target_path: nil)
+    @name = name
+
+    @files       = build_all_files(
+      files:       files,
+      source_path: source_path,
+      target_path: target_path,
+    )
+  end
+
+  def build_source_path(path)
+    path
+  end
+end

data/lib/indocker/artifacts/services/synchronizer.rb

@@ -0,0 +1,59 @@
+class Indocker::Artifacts::Services::Synchronizer
+  def initialize(logger:, progress:)
+    @logger   = logger
+    @progress = progress
+  end
+
+  def call(clonner, artifact_servers)
+    @logger.info("Syncing git artifacts")
+
+    remote_operations = []
+
+    artifact_servers.each do |artifact, servers|
+      remote_operations += servers.map do |server|
+        @progress.start_syncing_artifact(server, artifact)
+
+        thread = Thread.new do
+          server.synchronize do
+            session = Indocker::SshSession.new(
+              host: server.host,
+              user: server.user,
+              port: server.port,
+              logger: @logger
+            )
+
+            if artifact.is_git?
+              @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
+            end
+
+            artifact.files.each do |artifact_item|
+              source_path = artifact.build_source_path(artifact_item.source_path)
+
+              result = session.exec!("mkdir -p #{artifact_item.target_path}")
+              result = session.exec!("cp #{source_path} #{artifact_item.target_path}")
+
+              if !result.success?
+                @logger.error(result.stdout_data)
+                @logger.error(result.stderr_data)
+                exit 1
+              end
+            end
+
+            @progress.finish_syncing_artifact(server, artifact)
+          end
+        end
+
+        Indocker::Launchers::DTO::RemoteOperationDTO.new(thread, server, :artifact_sync)
+      end
+    end
+
+    remote_operations
+  end
+end

data/lib/indocker/build_context_helper.rb

@@ -4,7 +4,7 @@ class Indocker::BuildContextHelper
   def initialize(configuration, build_server)
     @configuration = configuration
     @build_server = build_server
-    @clonned_repositories = Hash.new(false)
+    @cloned_repositories = Hash.new(false)
   end
 
   def image_url(image_sym)

data/lib/indocker/crontab_redeploy_rules_builder.rb

@@ -1,10 +1,9 @@
 class Indocker::CrontabRedeployRulesBuilder
-  CRONTAB = <<-CRONTAB
-SHELL=/bin/bash
-PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-%{rules}
+  CRONTAB = <<~CRONTAB
+    SHELL=/bin/bash
+    PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+    %{rules}
   CRONTAB
 
   LOG_FILE      = "/var/log/indocker-redeploy-%{env}.log"

data/lib/indocker/launchers/configuration_deployer.rb

@@ -43,10 +43,10 @@ class Indocker::Launchers::ConfigurationDeployer
   def run!(configuration:, deployment_policy:)
     containers = find_containers_to_deploy(configuration, deployment_policy)
 
-    clonner = Indocker::Repositories::Clonner.new(configuration, @logger)
+    cloner = Indocker::Repositories::Cloner.new(configuration, @logger)
     build_server_pool = Indocker::ServerPools::BuildServerPool.new(configuration: configuration, logger: @logger)
     deployer = Indocker::ContainerDeployer.new(configuration: configuration, logger: @logger)
-    
+
     @global_logger.info("Establishing ssh sessions to all servers...")
     build_server_pool.create_sessions!
 
@@ -80,24 +80,24 @@ class Indocker::Launchers::ConfigurationDeployer
     remote_operations = sync_env_files(deploy_servers, configuration.env_files)
     wait_remote_operations(remote_operations)
 
-    remote_operations = pull_repositories(clonner, build_servers, configuration.repositories)
+    remote_operations = pull_repositories(cloner, build_servers, configuration.repositories)
     wait_remote_operations(remote_operations)
 
-    remote_operations = sync_artifacts(clonner, configuration.artifact_servers)
+    remote_operations = sync_artifacts(cloner, 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_server_pool, 
-        container, 
-        containers, 
-        deployment_policy.skip_build, 
-        deployment_policy.skip_deploy, 
-        deployment_policy.force_restart, 
+        configuration,
+        deployer,
+        build_server_pool,
+        container,
+        containers,
+        deployment_policy.skip_build,
+        deployment_policy.skip_deploy,
+        deployment_policy.force_restart,
         deployment_policy.skip_force_restart
       )
     end
@@ -127,7 +127,7 @@ class Indocker::Launchers::ConfigurationDeployer
 
   def find_containers_to_deploy(configuration, deployment_policy)
     load_enabled_containers(configuration)
-    
+
     containers = []
 
     deployment_policy.deploy_tags.each do |tag|
@@ -302,19 +302,19 @@ class Indocker::Launchers::ConfigurationDeployer
     @compiled_images[image] = true
   end
 
-  def recursively_deploy_container(configuration, deployer, build_server_pool, container, 
+  def recursively_deploy_container(configuration, deployer, build_server_pool, container,
     containers, skip_build, skip_deploy, force_restart, skip_force_restart)
 
     container.dependent_containers.each do |container|
       recursively_deploy_container(
-        configuration, 
-        deployer, 
-        build_server_pool, 
-        container, 
-        containers, 
-        skip_build, 
+        configuration,
+        deployer,
+        build_server_pool,
+        container,
+        containers,
+        skip_build,
         skip_deploy,
-        force_restart, 
+        force_restart,
         skip_force_restart
       )
     end
@@ -342,18 +342,7 @@ class Indocker::Launchers::ConfigurationDeployer
     deployer.deploy(container, force_restart, skip_force_restart, @progress)
   end
 
-  class RemoteOperation
-    attr_reader :thread, :server, :operation, :message
-
-    def initialize(thread, server, operation, message = nil)
-      @thread = thread
-      @server = server
-      @operation = operation
-      @message = message
-    end
-  end
-
-  def pull_repositories(clonner, servers, repositories)
+  def pull_repositories(cloner, servers, repositories)
     @logger.info("Clonning/pulling repositories")
 
     remote_operations = []
@@ -382,10 +371,10 @@ class Indocker::Launchers::ConfigurationDeployer
             )
           elsif repository.is_git?
             @logger.info("Pulling repository #{alias_name.to_s.green} for #{server.user}@#{server.host}")
-            result = clonner.clone(session, repository)
+            result = cloner.clone(session, repository)
 
             if result.exit_code != 0
-              @logger.error("Repository :#{repository.name} was not clonned")
+              @logger.error("Repository :#{repository.name} was not cloned")
               @logger.error(result.stderr_data)
               exit 1
             end
@@ -398,57 +387,20 @@ class Indocker::Launchers::ConfigurationDeployer
           @progress.finish_syncing_repository(server, alias_name)
         end
 
-        RemoteOperation.new(thread, server, :repository_pull)
+        Indocker::Launchers::DTO::RemoteOperationDTO.new(thread, server, :repository_pull)
       end
     end
 
     remote_operations
   end
 
-  def sync_artifacts(clonner, artifact_servers)
-    @logger.info("Syncing git artifacts")
-
-    remote_operations = []
-
-    artifact_servers.each do |artifact, servers|
-      remote_operations += servers.map do |server|
-        @progress.start_syncing_artifact(server, artifact)
-
-        thread = Thread.new do
-          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)
-
-            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}")
-
-            if !result.success?
-              @logger.error(result.stdout_data)
-              @logger.error(result.stderr_data)
-              exit 1
-            end
-
-            @progress.finish_syncing_artifact(server, artifact)
-          end
-        end
+  def sync_artifacts(cloner, artifact_servers)
+    artifacts_synchronizer = Indocker::Artifacts::Services::Synchronizer.new(
+      logger:   @logger,
+      progress: @progress,
+    )
 
-        RemoteOperation.new(thread, server, :artifact_sync)
-      end
-    end
+    remote_operations = artifacts_synchronizer.call(cloner, artifact_servers)
 
     remote_operations
   end
@@ -506,7 +458,7 @@ class Indocker::Launchers::ConfigurationDeployer
         @progress.finish_syncing_binaries(server)
       end
 
-      RemoteOperation.new(thread, server, :indocker_sync)
+      Indocker::Launchers::DTO::RemoteOperationDTO.new(thread, server, :indocker_sync)
     end
   end
 
@@ -547,7 +499,7 @@ class Indocker::Launchers::ConfigurationDeployer
           @progress.finish_syncing_env_file(server, alias_name)
         end
 
-        RemoteOperation.new(thread, server, :env_file_sync)
+        Indocker::Launchers::DTO::RemoteOperationDTO.new(thread, server, :env_file_sync)
       end
     end
 

data/lib/indocker/launchers/dto/remote_operation_dto.rb

@@ -0,0 +1,10 @@
+class Indocker::Launchers::DTO::RemoteOperationDTO
+  attr_reader :thread, :server, :operation, :message
+
+  def initialize(thread, server, operation, message = nil)
+    @thread = thread
+    @server = server
+    @operation = operation
+    @message = message
+  end
+end

data/lib/indocker/repositories/cloner.rb

@@ -0,0 +1,73 @@
+require 'net/ssh'
+
+class Indocker::Repositories::Cloner
+  def initialize(configuration, logger)
+    @configuration = configuration
+    @logger = logger
+  end
+
+  def clone(session, repository)
+    raise ArgumenError.new("only git repositories should be cloned") if !repository.is_git?
+
+    already_cloned = repository_already_cloned?(
+      session:     session,
+      target_path: repository.clone_path,
+      remote_url:  repository.remote_url,
+    )
+
+    git_command = if already_cloned
+      build_force_pull_command(
+        target_path: repository.clone_path,
+        branch_name: repository.branch,
+      )
+    else
+      build_clone_command(
+        target_path: repository.clone_path,
+        branch_name: repository.branch,
+        remote_url:  repository.remote_url,
+      )
+    end
+
+    session.exec!("ssh-agent bash -c 'ssh-add ~/.ssh/#{repository.ssh_key}; #{git_command}'")
+  end
+
+  private
+
+    def repository_already_cloned?(session:, target_path:, remote_url:)
+      target_remote_url = session.exec!(
+        build_git_remote_url_command(
+          path: target_path
+        )
+      ).stdout_data.chomp
+
+      @logger.debug("target remote_url:  #{target_remote_url.inspect}, checked remote_url: #{remote_url.inspect}")
+
+      target_remote_url == remote_url
+    end
+
+    def build_git_remote_url_command(path:)
+      [
+        "mkdir -p #{path}",
+        "cd #{path}",
+        "git config --get remote.origin.url",
+      ].join(" && ")
+    end
+
+    def build_clone_command(target_path:, branch_name:, remote_url:)
+      [
+        "rm -rf #{target_path}",
+        "mkdir -p #{target_path}",
+        "git clone -b #{branch_name} --depth 1 #{remote_url} #{target_path}",
+      ].join(" && ")
+    end
+
+    def build_force_pull_command(target_path:, branch_name:)
+      [
+        "cd #{target_path}",
+        "git add .",
+        "git reset HEAD --hard",
+        "git checkout #{branch_name}",
+        "git pull --force",
+      ].join(" && ")
+    end
+end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -103,33 +103,45 @@ 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/daemon_container/Dockerfile
-- example/indocker/bounded_contexts/shared/daemon_container/container.rb
-- example/indocker/bounded_contexts/shared/daemon_container/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/bad_containers/bad_container_build/Dockerfile
+- example/indocker/bounded_contexts/bad_containers/bad_container_build/container.rb
+- example/indocker/bounded_contexts/bad_containers/bad_container_build/image.rb
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/Dockerfile
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/build_context/bin/run
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/container.rb
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/image.rb
+- example/indocker/bounded_contexts/good_containers/daemon_container/Dockerfile
+- example/indocker/bounded_contexts/good_containers/daemon_container/container.rb
+- example/indocker/bounded_contexts/good_containers/daemon_container/image.rb
+- example/indocker/bounded_contexts/good_containers/dependency_container/Dockerfile
+- example/indocker/bounded_contexts/good_containers/dependency_container/container.rb
+- example/indocker/bounded_contexts/good_containers/dependency_container/image.rb
+- example/indocker/bounded_contexts/good_containers/good_container/Dockerfile
+- example/indocker/bounded_contexts/good_containers/good_container/build_context/example_file.txt
+- example/indocker/bounded_contexts/good_containers/good_container/container.rb
+- example/indocker/bounded_contexts/good_containers/good_container/image.rb
+- example/indocker/bounded_contexts/shared/parent_image/Dockerfile
+- example/indocker/bounded_contexts/shared/parent_image/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/env_files/development_env.env
 - example/indocker/infrastructure/artifacts.rb
 - example/indocker/infrastructure/build_servers.rb
+- example/indocker/infrastructure/env_files.rb
 - example/indocker/infrastructure/networks.rb
 - example/indocker/infrastructure/registries.rb
 - example/indocker/infrastructure/servers.rb
 - example/indocker/setup.rb
 - indocker.gemspec
 - lib/indocker.rb
+- lib/indocker/artifacts/base.rb
+- lib/indocker/artifacts/dto/file_dto.rb
 - lib/indocker/artifacts/git.rb
+- lib/indocker/artifacts/remote.rb
+- lib/indocker/artifacts/services/synchronizer.rb
 - lib/indocker/build_context.rb
 - lib/indocker/build_context_helper.rb
 - lib/indocker/build_server.rb
@@ -137,7 +149,6 @@ files:
 - lib/indocker/concerns/inspectable.rb
 - lib/indocker/configurations/configuration.rb
 - lib/indocker/configurations/configuration_builder.rb
-- lib/indocker/configurations/formatters/stdout.rb
 - lib/indocker/container_deployer.rb
 - lib/indocker/container_helper.rb
 - lib/indocker/containers/container.rb
@@ -163,6 +174,7 @@ files:
 - lib/indocker/indocker_helper.rb
 - lib/indocker/launchers/configuration_deployer.rb
 - lib/indocker/launchers/container_runner.rb
+- lib/indocker/launchers/dto/remote_operation_dto.rb
 - lib/indocker/launchers/images_compiler.rb
 - lib/indocker/logger_factory.rb
 - lib/indocker/networks/network.rb
@@ -171,7 +183,7 @@ files:
 - lib/indocker/registries/local.rb
 - lib/indocker/registries/remote.rb
 - lib/indocker/repositories/abstract.rb
-- lib/indocker/repositories/clonner.rb
+- lib/indocker/repositories/cloner.rb
 - lib/indocker/repositories/git.rb
 - lib/indocker/repositories/local.rb
 - lib/indocker/repositories/no_sync.rb

data/example/indocker/bounded_contexts/shared/daemon_container/Dockerfile

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

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

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

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

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

data/lib/indocker/configurations/formatters/stdout.rb

@@ -1,36 +0,0 @@
-class Indocker::Configurations::Formatters::Stdout
-  def print(configuration)
-    c = configuration
-    <<~EOS
-      Name: #{c.name}
-
-      Repositories: {
-      #{c.repositories.map do |alias_name, repository|
-            "  #{alias_name}: #{repository.inspect}"
-        end.join("\n")}
-      }
-
-      Registries: {
-      #{c.registries.map do |alias_name, registry|
-            "  #{alias_name}: #{registry.inspect}"
-        end.join("\n")}
-      }
-
-      Servers: {
-      #{c.servers.map do |alias_name, server|
-            "  #{alias_name}: #{server.inspect}"
-        end.join("\n")}
-      }
-
-      Build Servers: [
-      #{c.build_servers.map do |build_server|
-            "  #{build_server.inspect}"
-        end.join("\n")}
-      ]
-
-      Tags: #{c.tags.inspect}
-
-      Global build args: #{c.global_build_args.inspect}
-    EOS
-  end
-end

data/lib/indocker/repositories/clonner.rb

@@ -1,17 +0,0 @@
-require 'net/ssh'
-
-class Indocker::Repositories::Clonner
-  def initialize(configuration, logger)
-    @configuration = configuration
-    @logger = logger
-  end
-
-  def clone(session, repository)
-    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}")
-    
-    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