takeltau 0.43.1 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ce8c9adb2444d89382171349bad2541743195640c773e0e50e9bda09b1a813
-  data.tar.gz: dc8467fd57e0e273b8c8df0390d3b206a88f4f86691e62f77ae59a5d59404b44
+  metadata.gz: 1f155e82696808efbb960be240378c95cf81293a3fc6f8a77b5ebb5b94ec553c
+  data.tar.gz: bb436721278cf181fcc184f5fcc44b78b571eced96e20fde3db640f9d0598d9a
 SHA512:
-  metadata.gz: 727b786c912e1f966f0e05c0ff6caa5b619e0c54da280ede84eab297913587ea9d18dff97793dee3ad232504d56da9fca12ff51eaa9c1a759e88f5190fffd703
-  data.tar.gz: 1a7eb0cd00dcef8b061f9fd2f12d03ce9e815d12e031e6309a8d582468b4c33bb3cf8d5b580ac412cce788fdf27e3cf87f7c1b7967952dc0aaf212bfffa928ee
+  metadata.gz: 6d2f45c3ef3c0cf310eec89a6b1b59350e270489fd62a8964fa5b1f8f23e1d2a925f93325ca1ecb41cbde589353ceaf1c91033c06aa667727d55af430cdf2764
+  data.tar.gz: f09ba20dd55601707f26b5b6df6788150887baa296314e83407caa4f22f8b02ef131b713627ac826e65c5611bc8e3f5c2f80451a476d92f03cbff8c13af17948

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

@@ -37,12 +37,7 @@ module Takeltau
     LONGDESC
     # Run podman command.
     def podman(*args)
-      result = ship_container_podman args
-      unless result
-        say 'No connection to takelship'
-        exit 1
-      end
-      say result
+      say ship_container_podman args
     end
   end
 end

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

@@ -40,30 +40,8 @@ module ShipContainerLib
   # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize
 
-  # Run a podman command in a takelship container
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
-  def _ship_container_lib_podman(command)
-    return false unless docker_check_daemon
-
-    docker_host = _ship_info_lib_get_takelshipinfo['docker_host']
-    config_docker_host = config.active['ship_docker_host']
-    docker_host = config_docker_host if
-      config_docker_host != config.active['ship_default_docker_host']
-    localhost = config.active['ship_podman_localhost']
-    cmd_docker_run_command = format(
-      config.active['cmd_ship_container_podman'],
-      docker_host: docker_host,
-      localhost: localhost,
-      command: command
-    )
-    run cmd_docker_run_command
-  end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
-
   # Run a docker command in a takelship container
-  def _ship_container_lib_docker(command, tty = '')
+  def _ship_container_lib_docker(command, tty = '--tty')
     return false unless docker_check_daemon
 
     cmd_docker_run_command = format(

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

@@ -6,6 +6,6 @@ module ShipContainerPodman
   def ship_container_podman(args)
     return false unless ship_container_check_existing
 
-    _ship_container_lib_podman args.join(' ')
+    _ship_container_lib_docker "pod podman #{args.join(' ')}"
   end
 end

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

@@ -7,6 +7,7 @@ module Takeltau
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
+    include DockerContainerLib
     include ShipContainerCheckExisting
     include ShipContainerLib
     include ShipInfoLib

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

@@ -6,6 +6,8 @@ module ShipProjectStart
   def ship_project_start(project)
     return false if ship_container_check_existing
 
+    return false if _docker_container_lib_check_matrjoschka
+
     takelship = _ship_info_lib_get_takelshipinfo
     project = config.active['ship_default_project'] if project == 'default'
     project = takelship['default_project'] if project == 'default'

data/lib/takeltau/version

@@ -1 +1 @@
-0.43.1
+0.43.2

metadata

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