kuber_kit 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b8c2ffe3973bc966b245ceba37047030243d88119fd672db31efb002c67f86
-  data.tar.gz: 5fafd218e63a669da3951b723f7167700704902006d4dd4fef13541e8ad1559b
+  metadata.gz: f98d973c015745f6a4ccf054e3b97edbd8302683f747842ad6c9c5b3e4e49087
+  data.tar.gz: f2e8eb96e320bc73c1c3b03c611d1990515bd55182a93f30b28966b63da0c591
 SHA512:
-  metadata.gz: a1c79c0056820500948580504c533be1ba2f9ceafe282802a0bbe44021a34196706c23eb97b05e6905efc26f565719fd9a1c668ec99afdbda642261ad6e8b6e1
-  data.tar.gz: 3e4e33cc19ff7917ee5210dcdecae40ed22cb29d93f884bdb27adf3ec8565d3397ee8715ed8e89e75ae0316a0cf9192075d5afd66ba55caf3fe4f060064c88b9
+  metadata.gz: d550a0a8738447c939b5f6085ef71c7b79898854ede9c6e526e07f73fd4cf6a660b5a18c4e9277f80b081dc41f21f3371aafa69099d6383c884e954b7d15d9ae
+  data.tar.gz: 8b8ae8685c357608a6db776443171a1ea34d387272fe72f4802164e3345c7b6bf37d558d7967e5315d8718dbcf2a6a902cad2c1e3e84bb4de0b5811b1d075574

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.0)
+    kuber_kit (0.4.1)
       cli-ui
       contracts-lite
       dry-auto_inject

data/lib/kuber_kit/service_deployer/strategies/docker.rb

@@ -10,8 +10,10 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :image_name,
     :detached,
     :command_name,
-    :command_args,
-    :delete_if_exists
+    :custom_args,
+    :delete_if_exists,
+    :volumes,
+    :networks,
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -24,7 +26,9 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     
     container_name = strategy_options.fetch(:container_name, service.uri)
     command_name   = strategy_options.fetch(:command_name, "bash")
-    command_args   = strategy_options.fetch(:command_args, nil)
+    custom_args   = strategy_options.fetch(:custom_args, nil)
+    networks       = strategy_options.fetch(:networks, [])
+    volumes        = strategy_options.fetch(:volumes, [])
 
     image_name = strategy_options.fetch(:image_name, nil)
     if image_name.nil?
@@ -37,15 +41,23 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       docker_commands.delete_container(shell, container_name)
     end
 
-    command_args = Array(command_args)
+    custom_args = Array(custom_args)
     if container_name
-      command_args << "--name #{container_name}"
+      custom_args << "--name #{container_name}"
+    end
+    networks.each do |network|
+      docker_commands.create_network(shell, network)
+      custom_args << "--network #{network}"
+    end
+    volumes.each do |volume|
+      docker_commands.create_volume(shell, volume)
+      custom_args << "--volume #{volume}"
     end
 
     docker_commands.run(
       shell, image.remote_registry_url, 
       command:    command_name,
-      args:       command_args, 
+      args:       custom_args, 
       detached:   !!strategy_options[:detached]
     )
   end

data/lib/kuber_kit/service_deployer/strategies/docker_compose.rb

@@ -8,7 +8,7 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
   STRATEGY_OPTIONS = [
     :service_name, 
     :command_name,
-    :command_args,
+    :custom_args,
     :detached
   ]
 
@@ -26,12 +26,12 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
 
     service_name = strategy_options.fetch(:service_name, service.name.to_s)
     command_name = strategy_options.fetch(:command_name, "bash")
-    command_args = strategy_options.fetch(:command_args, nil)
+    custom_args = strategy_options.fetch(:custom_args, nil)
 
     docker_compose_commands.run(shell, config_path, 
       service:  service_name, 
       command:  command_name,
-      args:     command_args, 
+      args:     custom_args, 
       detached: !!strategy_options[:detached]
     )
   end

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

@@ -30,15 +30,11 @@ class KuberKit::Shell::Commands::DockerCommands
   end
 
   def container_exists?(shell, container_name, status: nil)
-    result = get_container_id(shell, container_name, status: status)
+    result = get_containers(shell, container_name, status: status)
     result && result != ""
   end
 
-  def delete_container(shell, container_name)
-    shell.exec!(%Q{docker rm -f #{container_name}})
-  end
-
-  def get_container_id(shell, container_name, only_healthy: false, status: nil)
+  def get_containers(shell, container_name, only_healthy: false, status: nil)
     command_parts = []
     command_parts << "docker ps -a -q"
 
@@ -52,4 +48,48 @@ class KuberKit::Shell::Commands::DockerCommands
 
     shell.exec!(command_parts.join(" "))
   end
+
+  def delete_container(shell, container_name)
+    shell.exec!("docker rm -f #{container_name}")
+  end
+
+  def create_network(shell, name)
+    unless network_exists?(shell, name)
+      shell.exec!("docker network create #{name}")
+    end
+  end
+
+  def network_exists?(shell, network_name)
+    result = get_networks(shell, network_name)
+    result && result != ""
+  end
+
+  def get_networks(shell, network_name)
+    command_parts = []
+    command_parts << "docker network ls"
+    command_parts << "--filter=\"name=#{network_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
+
+  def create_volume(shell, name)
+    unless volume_exists?(shell, name)
+      shell.exec!("docker volume create #{name}")
+    end
+  end
+
+  def volume_exists?(shell, volume_name)
+    result = get_volumes(shell, volume_name)
+    result && result != ""
+  end
+
+  def get_volumes(shell, volume_name)
+    command_parts = []
+    command_parts << "docker volume ls"
+    command_parts << "--filter=\"name=#{volume_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
 end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2021-01-13 00:00:00.000000000 Z
@@ -297,7 +297,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -312,8 +312,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []