kuber_kit 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74747b7166c91e6a78919e9888e8a643a0b199d4e3457015d902e7d12be0df1f
-  data.tar.gz: e292c750666b58996116cd1eb01a43f9472120346235eeec2cd3d7434770b381
+  metadata.gz: d12070a68a28af618ebe127fd4b5bc6e8091e5eda80d97b02bdc5811250a50a5
+  data.tar.gz: 1596fe61bafd254762585d87cfb72081c4149305d2754c80fb11d032f8deaf70
 SHA512:
-  metadata.gz: c06ee817240523fa6faec061d223337ed08d683a0ba15c671f4d65f1cdb1e3e8ce088ffb130f48d2c37a030f9200fde54b69ea6f6a542621266cb59ad6b7aa80
-  data.tar.gz: 989df85f77d4c8676def49566c8277172b8498f19798ce273704e3cd818176bd8fce4efe5bf208db88441d2d1ab38257c7d45ad6cc5895a95b9de10056eb9ff8
+  metadata.gz: 5a9ba53c902b8d7b24f84752c2fa71f37e1ed65e017f7a1cb1769590bea8fcbb662e1bd1e1223e44f2edcd3fe9697777054f6beccb777d909a8b704c6f121fc4
+  data.tar.gz: 10885940c62eac245e82522cad006f3709e10d53bbc9b1b9e33fb6917664ed77f353030bd2aeab315722aeb66386e7f465691b5f16d19ded2e14e0672249574b

data/CHANGELOG.md

@@ -1,7 +1,7 @@
-**0.9.0-0.9.1**
+**0.9.0-0.9.2**
 - Allow skipping confirmation during deployment
 - Added `kit sh` command to create a new shell
-- Do not expand image compile directory path in default config
+- Use tmp dir as image builds parent dir for remote compilation
 
 **0.8.4-0.8.8**
 - Added initial services support, to deploy before all other servies

data/lib/kuber_kit/configs.rb

@@ -2,7 +2,7 @@
 
 class KuberKit::Configs
   AVAILABLE_CONFIGS = [
-    :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, 
+    :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, :remote_image_compile_dir,
     :kuber_kit_dirname, :kuber_kit_min_version, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
     :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit, :deploy_simultaneous_limit,
     :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir, :shell_launcher_strategy
@@ -40,8 +40,8 @@ class KuberKit::Configs
     set :image_dockerfile_name,   "Dockerfile"
     set :image_build_context_dir, "build_context"
     set :image_tag,               'latest'
-    # do not use absolute path for compile dir, compilation could be done on remote server
-    set :image_compile_dir,       File.join(home_kuber_kit_path, "image_builds")
+    set :image_compile_dir,         File.join(absolute_kuber_kit_path, "image_builds")
+    set :remote_image_compile_dir,  File.join("tmp", "kuber_kit", "image_builds")
     set :docker_ignore_list,      DOCKER_IGNORE_LIST
     set :kuber_kit_dirname,       "kuber_kit"
     set :kuber_kit_min_version,   KuberKit::VERSION

data/lib/kuber_kit/image_compiler/action_handler.rb

@@ -8,17 +8,27 @@ class KuberKit::ImageCompiler::ActionHandler
 
   Contract KuberKit::Shell::AbstractShell, Symbol, String => Any
   def call(shell, image_name, build_id)
+    parent_dir = get_image_compile_parent_dir_for_shell(shell)
+
     image = image_store.get_image(image_name)
 
-    build_dir_cleaner.call(parent_dir: configs.image_compile_dir)
+    build_dir_cleaner.call(parent_dir: parent_dir)
     
-    compile_dir = generate_compile_dir(build_id: build_id)
+    compile_dir = generate_compile_dir(parent_dir: parent_dir, build_id: build_id)
 
     compiler.compile(shell, image, compile_dir)
   end
 
   private
-    def generate_compile_dir(build_id:)
-      File.join(configs.image_compile_dir, build_id)
+    def generate_compile_dir(parent_dir:, build_id:)
+      File.join(parent_dir, build_id)
+    end
+
+    def get_image_compile_parent_dir_for_shell(shell)
+      if shell.is_a?(KuberKit::Shell::LocalShell)
+        configs.image_compile_dir
+      else
+        configs.remote_image_compile_dir
+      end
     end
 end

data/lib/kuber_kit/shell/abstract_shell.rb

@@ -29,8 +29,4 @@ class KuberKit::Shell::AbstractShell
   def sync(local_path, remote_path, exclude: nil)
     raise KuberKit::NotImplementedError, "must be implemented"
   end
-
-  def expand_path(relative_path)
-    raise KuberKit::NotImplementedError, "must be implemented"
-  end
 end

data/lib/kuber_kit/shell/commands/bash_commands.rb

@@ -1,35 +1,25 @@
 class KuberKit::Shell::Commands::BashCommands
   def rm(shell, path)
-    absolute_path = shell.expand_path(path)
-    shell.exec!(%Q{rm "#{absolute_path}"})
+    shell.exec!(%Q{rm "#{path}"})
   end
 
   def rm_rf(shell, path)
-    absolute_path = shell.expand_path(path)
-    shell.exec!(%Q{rm -rf "#{absolute_path}"})
+    shell.exec!(%Q{rm -rf "#{path}"})
   end
 
   def cp(shell, source_path, dest_path)
-    abs_source_path = shell.expand_path(source_path)
-    abs_dest_path = shell.expand_path(dest_path)
-
-    shell.exec!(%Q{cp "#{abs_source_path}" "#{abs_dest_path}"})
+    shell.exec!(%Q{cp "#{source_path}" "#{dest_path}"})
   end
 
   def cp_r(shell, source_path, dest_path)
-    abs_source_path = shell.expand_path(source_path)
-    abs_dest_path = shell.expand_path(dest_path)
-
-    shell.exec!(%Q{cp -r "#{abs_source_path}" "#{abs_dest_path}"})
+    shell.exec!(%Q{cp -r "#{source_path}" "#{dest_path}"})
   end
 
   def mkdir(shell, path)
-    absolute_path = shell.expand_path(path)
-    shell.exec!(%Q{mkdir "#{absolute_path}"})
+    shell.exec!(%Q{mkdir "#{path}"})
   end
 
   def mkdir_p(shell, path)
-    absolute_path = shell.expand_path(path)
-    shell.exec!(%Q{mkdir -p "#{absolute_path}"})
+    shell.exec!(%Q{mkdir -p "#{path}"})
   end
 end

data/lib/kuber_kit/shell/local_shell.rb

@@ -127,10 +127,6 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     "KIT=#{Process.pid} #{command}"
   end
 
-  def expand_path(relative_path)
-    File.expand_path(relative_path)
-  end
-
   private
     def system_exec(command)
       exec(command)

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -71,10 +71,6 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
     true
   end
 
-  def expand_path(relative_path)
-    exec!("readlink -f #{relative_path}")
-  end
-
   private
     def ssh_session
       unless connected?

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Iskander Khaziev