indocker 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ace9121628e29137ad50db6a6ced1e89a8295d352f4df94292a9bf16dc3febb
-  data.tar.gz: 031a8379c69ef612d6782e4246f030eb747582b47f28a1eacedb79c5d345b5f8
+  metadata.gz: 1d3472a334b23e6fc3ecf88306d9af0a9394a90aec769711492226322e96e2d6
+  data.tar.gz: '08150afcc26f9f053290d6abb1160a2a32405fa08d1cb2740b4839f3298f8e74'
 SHA512:
-  metadata.gz: 24e0c0e996ceaccd442fb3513eedc4aa037720d6054a9696a9139d75c11262720290c5d2c1cd46545e1065689a9a518ad18c0a1bc2ead53e896db7fc0d81f24b
-  data.tar.gz: e620e1c14a5cc29e3bacc68cbdf72f9983fe951c510501b3c12703c3e0e8db3a9964af031086f573cf8e4e2101148772c44e4c51b347b590542f967fad04c071
+  metadata.gz: a3eeff429884e4f1961e725c97997b9c8c58874c7bb5ba31164e18cc6bc80e0169f82ceb01855dbaed098888397cf94f773c177b3aed4fe72091edfee2b969a5
+  data.tar.gz: 14480618981749a870f6acadb503d2cb9cbc08652d55a098c40801bbdcf3e01639d593cb100537c9399ed3df434a59740cf45ca9322939134982a78f0cf2c247

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.3.2)
+    indocker (0.3.6)
       net-ssh
 
 GEM
@@ -11,8 +11,8 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     method_source (1.0.0)
-    net-ssh (7.1.0)
-    pry (0.14.1)
+    net-ssh (7.2.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (12.3.3)
@@ -20,25 +20,25 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.3)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler
   indocker!
   pry
   rake (~> 12.3.3)
@@ -46,4 +46,4 @@ DEPENDENCIES
   simplecov (~> 0.18.5)
 
 BUNDLED WITH
-   1.17.3
+   2.4.20

data/indocker.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "net-ssh"
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.18.5"

data/lib/indocker/configurations/configuration.rb

@@ -4,6 +4,8 @@ class Indocker::Configurations::Configuration
   attr_reader :registries
   attr_reader :build_servers
   attr_reader :global_build_args
+  attr_reader :deploy_args
+  attr_reader :compile_args
   attr_reader :images
   attr_reader :containers
   attr_reader :volumes
@@ -88,6 +90,14 @@ class Indocker::Configurations::Configuration
     @global_build_args = hash
   end
 
+  def set_deploy_args(hash)
+    @deploy_args = hash
+  end
+
+  def set_compile_args(hash)
+    @compile_args = hash
+  end
+
   def add_image(image)
     @images.push(image)
   end

data/lib/indocker/docker_run_args.rb

@@ -133,6 +133,18 @@ class Indocker::DockerRunArgs
         args.push("--log-opt max-file=#{max_file}")
       end
 
+      cap_add = container.get_start_option(:cap_add)
+
+      if cap_add
+        args.push("--cap-add=#{cap_add}")
+      end
+
+      cap_drop = container.get_start_option(:cap_drop)
+
+      if cap_drop
+        args.push("--cap-drop=#{cap_drop}")
+      end
+
       health = container.get_start_option(:health) || {}
 
       if !health.is_a?(Hash)
@@ -155,6 +167,12 @@ class Indocker::DockerRunArgs
         args.push("--health-timeout #{health[:timeout]}")
       end
 
+      if configuration.deploy_args
+        configuration.deploy_args.each do |k, v|
+          args.push("--#{k}=#{v}")
+        end
+      end
+
       container.volumes.each do |volume|
         if volume.is_a?(Indocker::Volumes::Local)
           args.push("-v #{volume.local_path}:#{volume.path}")

data/lib/indocker/images/image.rb

@@ -60,7 +60,7 @@ class Indocker::Images::Image
       @compile_rpaths = flag_or_rpaths
     end
 
-    @dockerfile = path
+    nil
   end
 
   def dockerfile

data/lib/indocker/server_pools/build_server_connection.rb

@@ -2,8 +2,10 @@ require 'fileutils'
 
 class Indocker::ServerPools::BuildServerConnection < Indocker::ServerPools::ServerConnection
   def compile_image_remotely(configuration_name:, image_name:)
+    compile_args = @configuration.compile_args ? @configuration.compile_args.map { |k, v| "--compile-arg=\"#{k}=#{v}\"" }.join(" ") : ""
+
     result = exec!(
-      "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/compile -C #{configuration_name} -i #{image_name} -s #{@logger.debug? ? '-d' : ''}"
+      "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/compile -C #{configuration_name} -i #{image_name} #{compile_args} -s #{@logger.debug? ? '-d' : ''}"
     )
 
     Indocker::SshResultLogger

data/lib/indocker/server_pools/deploy_server_connection.rb

@@ -4,8 +4,10 @@ class Indocker::ServerPools::DeployServerConnection < Indocker::ServerPools::Ser
     debug_options   = @logger.debug? ? "-d" : ""
     force_restart_options = force_restart ? "-f" : ""
 
+    deploy_args = @configuration.deploy_args ? @configuration.deploy_args.map { |k, v| "--deploy-arg=\"#{k}=#{v}\"" }.join(" ") : ""
+
     result = exec!(
-      "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/run -C #{configuration_name} -c #{container_name} #{debug_options} #{command_output} #{force_restart_options}"
+      "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/run -C #{configuration_name} -c #{container_name} #{deploy_args} #{debug_options} #{command_output} #{force_restart_options}"
     )
 
     Indocker::SshResultLogger

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.3.5"
+  VERSION = "0.3.7"
 end

data/lib/indocker.rb

@@ -345,7 +345,7 @@ module Indocker
     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)
+      require_confirmation: false, compile_args: {}, deploy_args: {})
 
       deployment_policy = Indocker::DeploymentPolicy.new(
         deploy_containers:    containers,
@@ -362,6 +362,14 @@ module Indocker
         require_confirmation: require_confirmation,
       )
 
+      if compile_args
+        configuration.set_compile_args(compile_args)
+      end
+
+      if deploy_args
+        configuration.set_deploy_args(deploy_args)
+      end
+
       Indocker::Launchers::ConfigurationDeployer
         .new(logger: Indocker.logger, global_logger: Indocker.global_logger)
         .run(
@@ -390,7 +398,13 @@ module Indocker
         )
     end
 
-    def compile(images:, skip_dependent:)
+    def compile(images:, skip_dependent:, compile_args: {})
+      if compile_args
+        configuration.set_global_build_args(
+          Indocker::HashMerger.deep_merge(compile_args, configuration.global_build_args)
+        )
+      end
+
       Indocker::Launchers::ImagesCompiler
         .new(Indocker.logger)
         .compile(
@@ -400,7 +414,11 @@ module Indocker
         )
     end
 
-    def run(container_name, force_restart)
+    def run(container_name, force_restart, deploy_args: {})
+      if deploy_args
+        configuration.set_deploy_args(deploy_args)
+      end
+
       Indocker::Launchers::ContainerRunner
         .new(Indocker.logger)
         .run(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -29,16 +29,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Docker Containers Deployment