takeltau 0.44.29 → 0.44.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4af5fc9f1930e7b6b11e1ebf4d2af883e8db4637595392ab80856e214d96659a
-  data.tar.gz: f65c12c5676d3a4df61fe5fb90280446486af6bdd7ed8d47e5db4f546403f3b4
+  metadata.gz: 3627593aec06f80bf5db560ed0f9bb62b06cd61ef093b42b2e7c556e7b167909
+  data.tar.gz: 6493471141e19cdb8679618494d5e894e89554bad8d7a184ef10fa2da0f4bb58
 SHA512:
-  metadata.gz: 89433fe5f3335b761215eeb7733757befb4bf7549ddd4caf78249f8f436199abd3876a045114eef09e0574380e8354d8f1fbafaaba2165f5de790753d90b4da8
-  data.tar.gz: 93800b4cf6a686a44777d91d3adf6c611fe29e016b74c30f813bf9347d2e79393a7e20e68ff7a8adc68e0c8a77d4e831c1099be3206b98af13220160f54a9633
+  metadata.gz: 85830c8a81f33d082fd4fa0d90d241155a4c2d14f0d8ad4b0aad1f6be3a9f74de7b4c5f61202b5422adb4f1af98cddcc5addd89abea7c40f32a60d71c107a499
+  data.tar.gz: a3f4a5a29add541cb6e7c8807ea4046cd63734bff20ee8fd5ffdd67e406a742dd250837e4c3cb730fd3ed57ed6847d9e7b5e6e1cfa82b3eb464c60756f6b3ebf

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,
@@ -47,7 +43,6 @@ module ShipContainerLib
     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

@@ -21,6 +21,7 @@ module ShipProjectStart
     return false unless _ship_container_lib_started? ship_status
 
     _ship_project_start_print_banner project
+    say
     _ship_project_start_print_ports ports
     true
   end
@@ -40,6 +41,8 @@ module ShipProjectStart
     return false unless ship_container_check_existing
 
     _ship_project_start_print_banner project
+    say 'and is already sailing'
+    say
     _ship_project_start_print_ports ports
     true
   end
@@ -69,7 +72,6 @@ module ShipProjectStart
     say "The takelship #{ship_hostname}"
     say "departed from #{ship_dir}"
     say "ships project #{project}"
-    say
   end
 
   # print ports after starting a takelship

data/lib/takeltau/version

@@ -1 +1 @@
-0.44.29
+0.44.36

metadata

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