takeltau 0.44.27 → 0.44.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c930f7f250bd6480ece0a2cccab9211e1756e7d4051a046754520bbea0b997b7
-  data.tar.gz: a48606caaa7c511cdc2b4bc57f54dca50c22fb901a83b18128a7a5dfebfa7502
+  metadata.gz: e784334933edc9f9c65689cb759b700548c1094f5e267545f6c86c5125e7e0b2
+  data.tar.gz: bbef4da09c6bf229220cfe16b1eef529a82d36ceabaffc8678eda55f1c8a11dd
 SHA512:
-  metadata.gz: 65623941de415bb307f329767b3fdbc360726ace1a094cd65a9675b4974c36fdad8e0f6fc89dbf5a9357cf33372b263c79ccbf5836d118df9e01ab81322fbc29
-  data.tar.gz: 657ef5a7a80dd7c9796e29f77656cb5d42415922755afd852ba9498bcbf0542facbd6d1ccb7300924bef4bbe5d2a2dbf8b4e7f2251372fd2745c1f4e0d318ec4
+  metadata.gz: 7ebb0a7edcfc58a888af987d7743ae5f15518e2e8604f125a097f8b2c6015f7184fdd65edf56e2810ac63e8bb4d415e4ef6c4a1c9538eb2eaf4ee186e3431e16
+  data.tar.gz: 849e621d3ed843338cb433143f757387c3a78d0c22732b9be99d4f221df5b646a19b5bd745d83df09749e1221b1abd45de0d093be2475565437a9e248622ee39

data/lib/takeltau/default.yml

@@ -92,7 +92,7 @@ ship_data_dir: 'takelship'
 ship_default_docker_host: '32375'
 ship_default_project: 'default'
 ship_docker_host: '32375'
-ship_env: '--env TAKELSHIP_UPDATE=true'
+ship_env: ''
 ship_hostname: '%{ship_name}_%{unique}'
 ship_name: 'takelship'
 ship_podman_localhost: '127.0.0.1'

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

@@ -20,23 +20,19 @@ module ShipContainerLib
 
   # Run privileged docker command
   # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Metrics/MethodLength
-  def _ship_container_lib_docker_privileged(ports, command, args = '')
+  def _ship_container_lib_docker_privileged(ports, command, args: '', ship_hostname_suffix: nil, publish_ports: true)
+    suffix = "-#{ship_hostname_suffix}" unless ship_hostname_suffix.nil?
+    ship_hostname = "#{_ship_container_lib_ship_hostname}#{suffix}"
     args_privileged = config.active['ship_run_args_privileged']
-    args = "#{args} #{args_privileged}" if config.active['ship_run_args_privileged']
+    args = "#{args} #{args_privileged}" if args_privileged
+    ship_env = _ship_container_lib_ship_env ports
+    ports = _ship_container_lib_publish(ports, publish_ports)
     ship_data_dir = config.active['ship_data_dir']
-    ship_env = [config.active['ship_env']]
-    ports.each do |key, port|
-      envvar = "TAKELSHIP_#{key}".upcase
-      envstr = "--env #{envvar}=#{port['localhost']}"
-      ship_env << envstr
-    end
-    ports = _ship_container_lib_publish(ports)
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_privileged'],
       ship_docker: config.active['cmd_ship_docker'],
-      ship_hostname: _ship_container_lib_ship_hostname,
-      ship_env: ship_env.join(' '),
+      ship_hostname: ship_hostname,
+      ship_env: ship_env,
       ports: ports,
       project_root_dir: config.active['project_root_dir'],
       ship_data_dir: ship_data_dir,
@@ -44,10 +40,9 @@ module ShipContainerLib
       image: _ship_container_lib_image,
       command: command
     )
-    run cmd_docker_run_command
+    run_and_capture cmd_docker_run_command
   end
 
-  # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize
 
   # Run a docker command in a takelship container
@@ -84,8 +79,24 @@ module ShipContainerLib
     )
   end
 
+  # Create ship environment string
+  def _ship_container_lib_ship_env(ports)
+    ship_env = [config.active['ship_env']]
+    ports.each do |key, port|
+      envvar = "TAKELSHIP_#{key}".upcase
+      envstr = "--env #{envvar}=#{port['localhost']}"
+      ship_env << envstr
+    end
+    update = '--env TAKELSHIP_UPDATE=true'
+    update = "--env TAKELSHIP_UPDATE=#{ENV['TAKELSHIP_UPDATE']}" if ENV.key?('TAKELSHIP_UPDATE')
+    ship_env << update
+    ship_env.join(' ')
+  end
+
   # Create publish ports string
-  def _ship_container_lib_publish(ports)
+  def _ship_container_lib_publish(ports, publish_ports)
+    return '' unless publish_ports
+
     publish = []
     ports.each do |port|
       shipport = port[1]['takelship'].to_s

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

@@ -27,7 +27,7 @@ module Takeltau
     It will neither run the [PROJECT] in a takelship nor create service data.
     LONGDESC
     def create(project = 'default')
-      say ship_project_create project
+      exit ship_project_create project
     end
 
     #
@@ -87,7 +87,7 @@ module Takeltau
     It will neither run the [PROJECT] in a takelship nor touch the service data.
     LONGDESC
     def update(project = 'default')
-      say ship_project_create project, 'Updated'
+      exit ship_project_create project, 'Updated'
     end
   end
 end

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

@@ -10,12 +10,16 @@ module ShipProjectCreate
 
     log.debug "Dumping takelship project \"#{project}\""
     ports = _ship_ports_lib_get_ports(takelship, project)
-    project_root_dir = config.active['project_root_dir']
-    ship_data_dir = config.active['ship_data_dir']
-    args = []
-    args << "--volume #{project_root_dir}/#{ship_data_dir}:/home/podman/takelship"
-    args << '--env TAKELSHIP_DUMP=true'
-    _ship_container_lib_docker_privileged ports, project, args.join(' ')
-    "#{verb} takelship project \"#{project}\"."
+
+    ship_status = _ship_container_lib_docker_privileged(
+      ports,
+      project,
+      ship_hostname_suffix: 'dump',
+      publish_ports: false
+    )
+    return false unless _ship_container_lib_started? ship_status
+
+    say "#{verb} takelship project \"#{project}\"."
+    true
   end
 end

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

@@ -17,7 +17,9 @@ module ShipProjectStart
     _ship_ports_lib_write_ports(ports, project)
 
     log.debug "Starting takelship project \"#{project}\""
-    _ship_container_lib_docker_privileged ports, project
+    ship_status = _ship_container_lib_docker_privileged ports, project
+    return false unless _ship_container_lib_started? ship_status
+
     _ship_project_start_print_banner project
     _ship_project_start_print_ports ports
     true
@@ -51,6 +53,15 @@ module ShipProjectStart
     false
   end
 
+  # check if the ship started successfully
+  def _ship_container_lib_started?(ship_status)
+    return true if ship_status[2].zero?
+
+    say 'Unable to start the takelship. The error message was:'
+    say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"')
+    false
+  end
+
   # print banner with status information
   def _ship_project_start_print_banner(project)
     ship_hostname = _ship_container_lib_ship_hostname

data/lib/takeltau/version

@@ -1 +1 @@
-0.44.27
+0.44.35

metadata

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