takeltau 0.45.8 → 0.45.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea03d246d09318cf76e68b7a5dbad9b9d007fb208b11a99a37df261b1da453c
-  data.tar.gz: 9d4157d2200efd5c7286ea12a4697c259d8acaeb05a600b142ca529f2c45d6ac
+  metadata.gz: 3cc9402c72ae878c5a390d65bcd332c9c4a610c7812f14d1b69faa60567f4878
+  data.tar.gz: 5b63c7e948812fda3f954c9dcddd6a6d3b08c8f9bdd919dc28cb73d7c4833c65
 SHA512:
-  metadata.gz: a441a81ae69d713b6b9cb1a07a538e31789e7dd4b46dde6c6505d27e5f2c7931a72d7dc5ed8fa81bac98f124d896c1d705fbc7222e8eed6f2b5df862230df135
-  data.tar.gz: d0990faa441ad2c25b5c22d423050324369c3c23461cbc74810c7b4efbc58341fc5f302553763486cfc87fb176c6d9a5c05c063749d9f3cb23a71990fdf5bcf1
+  metadata.gz: 9048edb463c27df323ad284d7a0cdc191f0273be70409f819eeb6e53f0a17a971a3c48454cbbe167d2e838b1caded432ed264f1390f5d10a632df9017dc0c3a1
+  data.tar.gz: 07ff3edf1b39b1f313e6047a252df93eeb7bc7a6f39bc0f144bc78bf824cf8daf42d51cdb6ddc96c1933fc4dc6a7d844009a01e5cb14981aff3215bf73c7e9a6

data/lib/takeltau/default.yml

@@ -65,7 +65,7 @@ cmd_ship_docker_check: 'docker --version'
 cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive  %{ship_run_args_nonprivileged} %{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 %{project_root_dir}/%{ship_data_dir}:/home/podman/takelship %{ship_run_args_privileged} %{image} %{command}'
 cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
-docker_container_check_matrjoschka: 'true'
+docker_container_check_matrjoschka: true
 docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: ''
 docker_entrypoint_options: ''
@@ -87,13 +87,14 @@ mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
 mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'
 mutagen_socket_path_ssh_host: '~/.gnupg/S.gpg-agent.ssh'
 mutagen_socket_takelage_label: 'type=takelage'
-ship_container_check_matrjoschka: 'true'
+ship_container_check_matrjoschka: true
 ship_data_dir: 'takelship'
 ship_default_docker_host: '32375'
 ship_default_project: 'default'
 ship_docker_host: '32375'
 ship_env: ''
 ship_hostname: '%{ship_name}_%{unique}'
+ship_images_sync: true
 ship_name: 'takelship'
 ship_podman_localhost: '127.0.0.1'
 ship_repo: 'takelship'
@@ -102,5 +103,5 @@ ship_run_args_nonprivileged: ''
 ship_run_args_privileged: ''
 ship_tag: 'latest'
 ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/takelship.yml'
-ship_update: 'true'
+ship_update: true
 ship_user: 'takelwerk'

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

@@ -60,6 +60,8 @@ module ShipContainerLib
     args = "#{args} #{config_args}" if config_args
     args_debug = '--env TAKELSHIP_DEBUG=true'
     args = "#{args} #{args_debug}" if log.level == Logger::DEBUG
+    args_sync = '--env TAKELSHIP_IMAGES_SYNC=false'
+    args = "#{args} #{args_sync}" unless config.active['ship_images_sync']
     args
   end
 

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

@@ -41,7 +41,7 @@ module ShipProjectStart
     return false unless ship_container_check_existing
 
     _ship_project_start_print_banner project
-    say 'and is already sailing'
+    say 'is already sailing'
     say
     _ship_project_start_print_ports ports
     true
@@ -76,8 +76,15 @@ module ShipProjectStart
 
   # print ports after starting a takelship
   def _ship_project_start_print_ports(ports)
-    output = []
     max_length = _ship_project_start_get_maxlength ports
+    ports_list = _ship_project_start_get_ports_list ports, max_length
+    ports_list.sort_by! { |port| port[:port] }
+    say ports_list.map { |port| port[:string] }.join("\n")
+  end
+
+  # get a sortable list of port numbers and strings describing the ports
+  def _ship_project_start_get_ports_list(ports, max_length)
+    ports_list = []
     ports.each_value do |port|
       next unless port['localhost'].to_i.between? 1, 65_535
 
@@ -85,9 +92,12 @@ module ShipProjectStart
       service = "[#{port['service']} #{port['protocol']}]"
       description = port['description']
       description = " (#{description})" if port.key? 'description'
-      output << "#{url.ljust(max_length['url'])} #{service.ljust(max_length['service'])}#{description}"
+      ports_list << {
+        port: port['localhost'].to_i,
+        string: "#{url.ljust(max_length['url'])} #{service.ljust(max_length['service'])}#{description}"
+      }
     end
-    say output.join("\n")
+    ports_list
   end
 
   # get max length of left column

data/lib/takeltau/version

@@ -1 +1 @@
-0.45.8
+0.45.10

metadata

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