takeltau 0.45.6 → 0.45.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31fce71fd0ba4d101ed66b23703b7c4dc8877bcb45beb52bc632c576ad9976af
-  data.tar.gz: 72a1ab91250660ddb24b8899edb50c73bfe06c06403fdb24fe4be1d42c4f0e18
+  metadata.gz: 8ea03d246d09318cf76e68b7a5dbad9b9d007fb208b11a99a37df261b1da453c
+  data.tar.gz: 9d4157d2200efd5c7286ea12a4697c259d8acaeb05a600b142ca529f2c45d6ac
 SHA512:
-  metadata.gz: eb9a22c1e05fd55f9d57719595f854783b693d065a922dab8f07f22eeacf334ce6483c4ff2791387a9238cb489cc5d52a350846b3270da87597ee1cf49acc3f2
-  data.tar.gz: 6a03a31c3ea73374798e6f10a7e84a1fe3f988770f91ef210b726ac6eafebd65dac978fa88d6e350fa15ec3a238a98d4bdcaa695c6a9403dc90a538610bb6596
+  metadata.gz: a441a81ae69d713b6b9cb1a07a538e31789e7dd4b46dde6c6505d27e5f2c7931a72d7dc5ed8fa81bac98f124d896c1d705fbc7222e8eed6f2b5df862230df135
+  data.tar.gz: d0990faa441ad2c25b5c22d423050324369c3c23461cbc74810c7b4efbc58341fc5f302553763486cfc87fb176c6d9a5c05c063749d9f3cb23a71990fdf5bcf1

data/lib/takeltau/lib/system.rb

@@ -172,7 +172,7 @@ module SystemModule
     true
   end
 
-  # Read yaml file.
+  # Read file.
   def _file_read(file)
     begin
       @content_file = File.read File.expand_path(file)
@@ -213,8 +213,7 @@ module SystemModule
     begin
       content = YAML.safe_load content_yaml
     rescue Psych::SyntaxError
-      log.debug "Invalid YAML file \"#{file}\""
-      log.debug "Try: yamllint #{file}"
+      log.debug 'Invalid YAML'
       return false
     end
     content

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

@@ -6,8 +6,7 @@ module ShipContainerLib
 
   # Run nonprivileged docker command
   def _ship_container_lib_docker_nonprivileged(command, args = '')
-    args_nonprivileged = config.active['ship_run_args_nonprivileged']
-    args = "#{args} #{args_nonprivileged}" if config.active['ship_run_args_nonprivileged']
+    args = _ship_container_lib_ship_args args, config.active['ship_run_args_nonprivileged']
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_nonprivileged'],
       ship_docker: config.active['cmd_ship_docker'],
@@ -23,8 +22,7 @@ module ShipContainerLib
   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 args_privileged
+    args = _ship_container_lib_ship_args args, config.active['ship_run_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']
@@ -57,6 +55,14 @@ module ShipContainerLib
     run_and_exit cmd_docker_run_command
   end
 
+  # Return privileged args
+  def _ship_container_lib_ship_args(args, config_args)
+    args = "#{args} #{config_args}" if config_args
+    args_debug = '--env TAKELSHIP_DEBUG=true'
+    args = "#{args} #{args_debug}" if log.level == Logger::DEBUG
+    args
+  end
+
   # Return takelship image
   def _ship_container_lib_image
     ship_user = config.active['ship_user']

data/lib/takeltau/version

@@ -1 +1 @@
-0.45.6
+0.45.8

metadata

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