takeltau 0.43.10 → 0.43.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e3cfcc5190c832bb598a7995d870a9ad8ffbd2d80cc27d40716a2c8f48234e9
-  data.tar.gz: 2329865f99624b7107046aeb8662ba7116e6ab2a5b92045f11a39bde8d38999a
+  metadata.gz: 96a4925af8567894bdbcc0b0e983fce78e29ef2980d17bdfcc4fdbc3141313f3
+  data.tar.gz: ace590b944abfbbdbe620d3cabd7a16d2593f47287702148c623ede6ca677e98
 SHA512:
-  metadata.gz: c85f8b70f10c8982e88bb08bab002c22e5efdaa4dc8e4652ba87733ab9c0b8e34dd38923e402a8564de1a827fe487877b56733a19d7574f99f26a5d08f6419c4
-  data.tar.gz: b64fe24cc6176b74ebe52f7d6010103bf1b060cd411dacb59c207999839971379a38409e0d65b0947dbd30136af01c7f8841c329e74294203ef774770ef4bd32
+  metadata.gz: f9a323d95e42e6679e51360d53b24636dd3243b538e46b06f38efe0b09cb4017525f07443db8dcd791eaaa1e9ae7df759a9c6fd4ee1327044e66542878eedd6b
+  data.tar.gz: 61620c4054fcf13cf2c15583a5478c07a30a11cb9340ecf5363ae72578f4bfc8ca83cf58c471131e2e19d4e814e18711918ef8131c6b41d930a7921c64de83f4

data/lib/takeltau/default.yml

@@ -87,9 +87,10 @@ ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/projects/takelship.yml'
 ship_podman_localhost: '127.0.0.1'
 ship_docker_host: '32375'
 ship_default_docker_host: '32375'
-cmd_ship_project_start_docker_run_nonprivileged: '%{docker} run --rm --interactive %{image} %{command}'
-cmd_ship_project_start_docker_run_privileged: '%{docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume ./%{ship_data_dir}:/home/podman/takelship %{image} %{command}'
-cmd_ship_project_start_docker_stop: '%{docker} stop %{ship_hostname}'
-cmd_ship_container_check_existing_docker_ps: '%{docker} ps --filter name=^%{ship_name}$ --quiet'
-cmd_ship_container_docker: '%{docker} exec --interactive %{tty} %{ship_hostname} %{command}'
+cmd_ship_docker: 'docker'
+cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{image} %{command}'
+cmd_ship_project_start_docker_run_privileged: '%{ship_docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume ./%{ship_data_dir}:/home/podman/takelship %{image} %{command}'
+cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
+cmd_ship_container_check_existing_docker_ps: '%{ship_docker} ps --filter name=^%{ship_name}$ --quiet'
+cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_hostname} %{command}'
 cmd_ship_container_login: 'bash'

data/lib/takeltau/docker/check/daemon.rb

@@ -6,7 +6,7 @@ module DockerCheckDaemon
   # @return [Boolean] is the docker daemon running?
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
-  def docker_check_daemon
+  def docker_check_daemon(docker = 'cmd_docker')
     return true if @docker_daemon_running
 
     return false unless command_available_else_error? config.active['cmd_docker']
@@ -15,7 +15,7 @@ module DockerCheckDaemon
 
     cmd_docker_info = format(
       config.active['cmd_docker_check_daemon_docker_info'],
-      docker: config.active['cmd_docker']
+      docker: config.active[docker]
     )
     status = try cmd_docker_info
 

data/lib/takeltau/ship/container/check/existing.rb

@@ -8,7 +8,7 @@ module ShipContainerCheckExisting
     ship_hostname = _ship_container_lib_ship_hostname
     log.debug "Checking if takelship \"#{ship_hostname}\" is existing"
 
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     stdout_str = run _ship_container_cmd_check_existing ship_hostname
 
@@ -27,7 +27,7 @@ module ShipContainerCheckExisting
   def _ship_container_cmd_check_existing(ship_hostname)
     format(
       config.active['cmd_ship_container_check_existing_docker_ps'],
-      docker: config.active['cmd_docker'],
+      ship_docker: config.active['cmd_ship_docker'],
       ship_name: ship_hostname
     )
   end

data/lib/takeltau/ship/container/lib.rb

@@ -6,11 +6,11 @@ module ShipContainerLib
 
   # Run nonprivileged docker command
   def _ship_container_lib_docker_nonprivileged(command)
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_nonprivileged'],
-      docker: config.active['cmd_docker'],
+      ship_docker: config.active['cmd_ship_docker'],
       image: _ship_container_lib_image,
       command: command
     )
@@ -21,7 +21,7 @@ module ShipContainerLib
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
   def _ship_container_lib_docker_privileged(ports, command)
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     ship_data_dir = config.active['ship_data_dir']
     ship_env = config.active['ship_env']
@@ -29,7 +29,7 @@ module ShipContainerLib
     ports = config.active['ports'] unless config.active['ship_ports'].empty?
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_privileged'],
-      docker: config.active['cmd_docker'],
+      ship_docker: config.active['cmd_ship_docker'],
       ship_hostname: _ship_container_lib_ship_hostname,
       ship_env: ship_env,
       ports: ports,
@@ -44,11 +44,11 @@ module ShipContainerLib
 
   # Run a docker command in a takelship container
   def _ship_container_lib_docker(command, tty = '--tty')
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     cmd_docker_run_command = format(
       config.active['cmd_ship_container_docker'],
-      docker: config.active['cmd_docker'],
+      ship_docker: config.active['cmd_ship_docker'],
       ship_hostname: _ship_container_lib_ship_hostname,
       tty: tty,
       command: command
@@ -58,13 +58,13 @@ module ShipContainerLib
 
   # Run takelship docker stop command
   def _ship_container_lib_docker_stop
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     return false unless ship_container_check_existing
 
     cmd_docker_stop_command = format(
       config.active['cmd_ship_project_start_docker_stop'],
-      docker: config.active['cmd_docker'],
+      ship_docker: config.active['cmd_ship_docker'],
       ship_hostname: _ship_container_lib_ship_hostname
     )
     run cmd_docker_stop_command

data/lib/takeltau/ship/container/login.rb

@@ -4,7 +4,7 @@
 module ShipContainerLogin
   # Run a login command in a takelship
   def ship_container_login
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     return false unless ship_container_check_existing
 

data/lib/takeltau/ship/container/podman.rb

@@ -4,7 +4,7 @@
 module ShipContainerPodman
   # Run a podman command in a takelship
   def ship_container_podman(args)
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     return false unless ship_container_check_existing
 

data/lib/takeltau/ship/container/update.rb

@@ -4,7 +4,7 @@
 module ShipContainerUpdate
   # Update takelship image.
   def ship_container_update
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     cmd_docker_pull = _ship_container_update_cmd_docker_pull
 

data/lib/takeltau/ship/project/start.rb

@@ -4,7 +4,7 @@
 module ShipProjectStart
   # Start a takelship
   def ship_project_start(project)
-    return false unless docker_check_daemon
+    return false unless docker_check_daemon 'cmd_ship_docker'
 
     return false if _docker_container_lib_check_matrjoschka
 

data/lib/takeltau/version

@@ -1 +1 @@
-0.43.10
+0.43.14

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.43.10
+  version: 0.43.14
 platform: ruby
 authors:
 - Takelwerk