takeltau 0.43.16 → 0.43.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3550300f915f6a1a05dc9249f80d11638662bca1be39f73b3bff520c284f6e
-  data.tar.gz: 43e6b6e14a75cbdcf77e314c03203d419ae938c6b7b0cf0064050bdaf59efd42
+  metadata.gz: 1b433846c95247973be471defc8590126e5271d13069fa300f0abbd1f5c5e580
+  data.tar.gz: a94d442031c78bddb68f2789732f5f98ddbbbcd7819b59053becc20a218d5ded
 SHA512:
-  metadata.gz: fa2a089bf563ad78fe96f858e14dd4e04757e0f59de0bf76ac76f32c4e1d7d379e078ef73054b25ca955869c12bceab04155ce6e63759ab32ff09685e655752b
-  data.tar.gz: 25ee8bc050a0a49d4e757d743bbafb45a4dffde9e1d2f827cd74e9b28a644eab7d21101fbbc137d05f98591a803446d44cc22b40948e3a66dbe600b003be37a6
+  metadata.gz: 8e334b9e260c0cc13ac64dd0dc1caa0aff76bcb8d9d67ce4ca5143bacb6447ee9e17c5ae20718b6532ffb226c66397048a26cd08b0b0462f1a88bb5b49f4a243
+  data.tar.gz: c7059141332e62277af38fabb1aa411f1e260470cea3bee256d4812e053a26d94e155c37ae5829bc176cc37576cf70a00c40704214bed5163205108509c792fd

data/lib/takeltau/default.yml

@@ -1,25 +1,28 @@
 ---
 cmd_docker: 'docker'
-cmd_docker_check_daemon_docker_version: '%{docker} --version'
+cmd_docker_check: 'docker --version'
+cmd_docker_check_daemon_info: "%{docker} info --format '{{ .ServerVersion}}'"
 cmd_docker_container_check_existing_docker_ps: '%{docker} ps --filter name=^%{container}$ --quiet'
-cmd_docker_container_check_network_docker_network: '%{docker} network ls --quiet --filter name=^%{network}$'
+cmd_docker_container_check_network_docker_network: '%{docker} network ls --filter name=^%{network}$ --quiet'
 cmd_docker_container_check_orphaned_docker_exec: '%{docker} exec --interactive %{container} ps a'
-cmd_docker_container_create: '%{docker} run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: '%{docker} run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{workdir}:/project %{volume_dev} --volume %{homedir}:/hostdir --workdir /project %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --extra=%{extra} %{entrypoint_options}'
 cmd_docker_container_create_network: '%{docker} network create %{network}'
+cmd_docker_container_docker_exec: '%{docker} exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
 cmd_docker_container_enter_container: '%{docker} exec --interactive --tty %{container} %{loginpoint} --username %{username}'
 cmd_docker_container_get_container_name: '%{docker} ps --filter id=%{container} --format "{{.Names}}"'
 cmd_docker_container_get_containers: '%{docker} ps --all --filter name=^%{docker_repo}_ --quiet'
+cmd_docker_container_get_mounted_dir: "%{docker} container inspect %{name} --format '{{range .Mounts}}{{ if eq .Destination %{dest_dir} }}{{println .Source }}{{ end }}{{end}}'"
 cmd_docker_container_remove_network: '%{docker} network rm %{network}'
-cmd_docker_container_docker_exec: '%{docker} exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
 cmd_docker_container_stop_container: '%{docker} stop %{container}'
 cmd_docker_image_tag_check_docker_images: '%{docker} images --quiet %{image}'
 cmd_docker_image_tag_list_docker_images: '%{docker} images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 cmd_docker_image_update_docker_pull: '%{docker} pull %{docker_user}/%{docker_repo}:%{docker_tag}'
 cmd_docker_image_update_docker_remove_dangling: '%{docker} image prune --force'
 cmd_git: 'git'
-cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
-cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
+cmd_git_check: 'git --version'
 cmd_git_check_clean_git_status: 'git status --porcelain'
+cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
+cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_hg_get_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
@@ -30,29 +33,38 @@ cmd_git_lib_git_push_origin: 'git push origin %{main}'
 cmd_hg_list_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order hg paths default --repository {//} --template "hg\ clone\ {url}\ " \; echo {//}'
 cmd_hg_pull_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order echo \; cd {//} \; pwd \; hg pull --update'
 cmd_hg_push_repos: 'cd %{root}; find * -type d -name ".hg" | parallel --keep-order echo \; cd {//} \; pwd \; hg commit --addremove --message "Update\ hg\ repos" \; hg bookmarks --force main \; hg push'
-cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
-cmd_info_status_lib_git_email: 'git -C %{root} config user.email'
-cmd_info_status_lib_git_signingkey: 'git -C %{root} config user.signingKey'
-cmd_info_status_lib_git_key_available: 'gpg --list-key %{key}'
 cmd_info_status_arch_get_arch: 'arch'
 cmd_info_status_gopass_root_store: 'gopass config | grep "path" | cut -d " " -f 2'
 cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_hg_username: 'hg config ui.username'
+cmd_info_status_lib_git_email: 'git -C %{root} config user.email'
+cmd_info_status_lib_git_key_available: 'gpg --list-key %{key}'
+cmd_info_status_lib_git_name: 'git -C %{root} config user.name'
+cmd_info_status_lib_git_signingkey: 'git -C %{root} config user.signingKey'
 cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
-cmd_init_lib_git_init: 'git init && git checkout -b main'
 cmd_init_lib_git_add_all: 'git add --all'
 cmd_init_lib_git_commit_initial: 'git commit -m "Initial commit"'
+cmd_init_lib_git_init: 'git init && git checkout -b main'
 cmd_init_lib_hg_clone: 'bash hgclone'
 cmd_mutagen: 'mutagen'
+cmd_mutagen_check: 'mutagen --version'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
+cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
 cmd_mutagen_forward_socket_docker: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} --socket-group-source=docker --socket-permission-mode=0660 docker://root@%{container}:unix:/var/run/docker.sock unix:%{hostsock}'
-cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'
-cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
-cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
 cmd_mutagen_forward_socket_list: 'mutagen forward list --label-selector="%{takellabel}"'
+cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
+cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
+cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_hostname} %{command}'
+cmd_ship_container_login: 'bash'
+cmd_ship_docker: 'docker'
+cmd_ship_docker_check: 'docker --version'
+cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{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 ./%{ship_data_dir}:/home/podman/takelship %{image} %{command}'
+cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
+docker_container_check_matrjoschka: 'true'
 docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: ''
 docker_entrypoint_options: ''
@@ -74,24 +86,18 @@ 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_name: 'takelship'
-ship_hostname: '%{ship_name}_%{unique}'
+ship_container_check_matrjoschka: 'true'
+ship_data_dir: 'takelship'
+ship_default_docker_host: '32375'
 ship_default_project: 'default'
+ship_docker_host: '32375'
 ship_env: '--env TAKELSHIP_UPDATE=true'
+ship_hostname: '%{ship_name}_%{unique}'
+ship_name: 'takelship'
+ship_podman_localhost: '127.0.0.1'
 ship_ports: ''
-ship_user: 'takelwerk'
+ship_port_expose_podman_socket: 'false'
 ship_repo: 'takelship'
 ship_tag: 'latest'
-ship_data_dir: 'takelship'
-ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/projects/takelship.yml'
-ship_podman_localhost: '127.0.0.1'
-ship_docker_host: '32375'
-ship_default_docker_host: '32375'
-cmd_ship_docker: 'docker'
-cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{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 ./%{ship_data_dir}:/home/podman/takelship %{image} %{command}'
-cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
-cmd_ship_container_check_existing_docker_ps: '%{ship_docker} ps --filter name=^%{ship_name}$ --quiet'
-cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_hostname} %{command}'
-cmd_ship_container_login: 'bash'
-cmd_docker_container_get_mounted_dir: '%{ship_docker} container inspect %{ship_hostname} --format "{{ (index .Mounts 0).Source }}"'
+ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/takelship.yml'
+ship_user: 'takelwerk'

data/lib/takeltau/docker/check/daemon.rb

@@ -6,15 +6,12 @@ module DockerCheckDaemon
   # @return [Boolean] is the docker daemon running?
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
-  def docker_check_daemon(docker = 'cmd_docker')
-    return true if @docker_daemon_running
-
-    return false unless command_available_else_error? config.active['cmd_docker']
+  def docker_check_daemon(docker = 'cmd_docker', docker_check = 'cmd_docker_check')
+    return false unless command_available_else_error? config.active[docker_check]
 
     log.debug 'Check if the docker daemon is running'
-
     cmd_docker_info = format(
-      config.active['cmd_docker_check_daemon_docker_version'],
+      config.active['cmd_docker_check_daemon_info'],
       docker: config.active[docker]
     )
     status = try cmd_docker_info
@@ -25,7 +22,6 @@ module DockerCheckDaemon
     end
 
     log.debug 'The docker daemon is running'
-    @docker_daemon_running = true
     true
   end
   # rubocop:enable Metrics/AbcSize

data/lib/takeltau/docker/cli.rb

@@ -3,6 +3,20 @@
 module Takeltau
   # tau docker
   class Docker < SubCommandBase
+    # Initialize docker
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      log.debug 'Check docker dameon for docker subcommand'
+      exit false unless docker_check_daemon
+    end
+
     desc 'check [COMMAND]', 'Check docker'
     subcommand 'check', DockerCheck
 

data/lib/takeltau/docker/container/check/existing.rb

@@ -8,8 +8,6 @@ module DockerContainerCheckExisting
   def docker_container_check_existing(container)
     log.debug "Checking if container \"#{container}\" is existing"
 
-    return false unless docker_check_daemon
-
     stdout_str = run _docker_container_cmd_check_existing container
 
     if stdout_str.to_s.chomp.empty?

data/lib/takeltau/docker/container/check/network.rb

@@ -7,8 +7,6 @@ module DockerContainerCheckNetwork
   def docker_container_check_network(network)
     log.debug "Checking if network \"#{network}\" is existing"
 
-    return false unless docker_check_daemon
-
     stdout_str = run _docker_container_cmd_check_network network
 
     if stdout_str.to_s.chomp.empty?

data/lib/takeltau/docker/container/check/orphaned.rb

@@ -7,8 +7,6 @@ module DockerContainerCheckOrphaned
   def docker_container_check_orphaned(container)
     log.debug "Check if container \"#{container}\" is orphaned"
 
-    return false unless docker_check_daemon
-
     stdout_str = run _docker_container_cmd_check_orphaned container
 
     if stdout_str.include? '/loginpoint.py'

data/lib/takeltau/docker/container/clean.rb

@@ -6,8 +6,6 @@ module DockerContainerClean
   def docker_container_clean
     log.debug 'Removing all docker containers'
 
-    return false unless docker_check_daemon
-
     return false if _docker_container_clean_harakiri?
 
     mutagen_socket_terminate "--label-selector='#{@takellabel}'"

data/lib/takeltau/docker/container/command.rb

@@ -6,8 +6,6 @@ module DockerContainerCommand
   def docker_container_command(command)
     log.debug 'Running command in container'
 
-    return false unless docker_check_daemon
-
     # no matrjoschka test here
 
     unless docker_container_check_existing @hostname

data/lib/takeltau/docker/container/daemon.rb

@@ -6,8 +6,6 @@ module DockerContainerDaemon
   def docker_container_daemon
     log.debug 'Starting docker container as daemon'
 
-    return false unless docker_check_daemon
-
     result = _docker_container_lib_create_net_and_ctr @hostname
 
     _docker_container_lib_start_sockets

data/lib/takeltau/docker/container/lib.rb

@@ -115,8 +115,11 @@ module DockerContainerLib
 
   # Check if we are already inside a takelage container
   def _docker_container_lib_check_matrjoschka
-    log.debug 'Checking if we are already inside a takelage container'
+    return false unless config.active['docker_container_check_matrjoschka']
+
+    return false unless config.active['ship_container_check_matrjoschka']
 
+    log.debug 'Checking if we are already inside a takelage container'
     unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
       log.debug 'We are not inside a takelage container'
       return false
@@ -177,6 +180,21 @@ module DockerContainerLib
 
     run cmd_docker_stop
   end
+
+  # Get the mounted takelage directory
+  def _docker_container_lib_get_mounted_dir(name, destination, docker)
+    log.debug 'Getting mounted directory from ' \
+                "container \"#{name}\""
+
+    cmd_get_mounted_dir = format(
+      config.active['cmd_docker_container_get_mounted_dir'],
+      docker: docker,
+      name: name,
+      dest_dir: "\"#{destination}\""
+    )
+
+    (run cmd_get_mounted_dir).strip
+  end
 end
 # rubocop:enable Style/IfUnlessModifier
 # rubocop:enable Metrics/ModuleLength

data/lib/takeltau/docker/container/list.rb

@@ -6,26 +6,31 @@ module DockerContainerList
   def docker_container_list
     log.debug 'List docker containers'
 
-    return false unless docker_check_daemon
-
     _docker_container_list_get_inventory.to_yaml
   end
 
   private
 
   # Get the current inventory
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
   def _docker_container_list_get_inventory
+    destination = '/project'
+    docker = config.active['cmd_docker']
     inventory = _docker_container_list_new_inventory
     _docker_container_lib_get_containers.each do |container|
       name = _docker_container_lib_get_container_name_by_id container
+      dir = (_docker_container_lib_get_mounted_dir name, destination, docker).strip
       if docker_container_check_orphaned container
-        inventory['orphaned']['hosts'] << name
+        inventory['orphaned']['hosts'] << { name => dir }
       else
-        inventory['login']['hosts'] << name
+        inventory['login']['hosts'] << { name => dir }
       end
     end
     inventory
   end
+  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 
   # Create a new inventory
   def _docker_container_list_new_inventory

data/lib/takeltau/docker/container/login.rb

@@ -6,8 +6,6 @@ module DockerContainerLogin
   def docker_container_login
     log.debug 'Logging in to docker container'
 
-    return false unless docker_check_daemon
-
     if _docker_container_lib_check_matrjoschka
       log.error 'You cannot log in to takelage from within takelage'
       return false

data/lib/takeltau/docker/container/prune.rb

@@ -6,8 +6,6 @@ module DockerContainerPrune
   def docker_container_prune
     log.debug 'Removing orphaned docker containers'
 
-    return false unless docker_check_daemon
-
     networks = _docker_container_prune_kill_orphaned_containers
     _docker_container_lib_remove_networks networks
   end

data/lib/takeltau/docker/image/tag/check.rb

@@ -7,8 +7,6 @@ module DockerImageTagCheck
   def docker_image_tag_check(tag)
     log.debug "Check if docker image tag \"#{tag}\" exists"
 
-    return false unless docker_check_daemon
-
     if tag.to_s.chomp.empty?
       log.warn 'No docker image tag specified'
       return false

data/lib/takeltau/docker/image/tag/latest.rb

@@ -7,8 +7,6 @@ module DockerImageTagLatest
   def docker_image_tag_latest
     log.debug 'Getting latest docker image tag'
 
-    return false unless docker_check_daemon
-
     tags = docker_image_tag_list
 
     tag_latest = if tags.include? 'latest'

data/lib/takeltau/docker/image/update.rb

@@ -4,8 +4,6 @@
 module DockerImageUpdate
   # Backend method for docker image update.
   def docker_image_update
-    return false unless docker_check_daemon
-
     cmd_docker_pull = _docker_image_update_cmd_docker_pull
 
     cmd_docker_remove_dangling = format(

data/lib/takeltau/init/lib.rb

@@ -6,7 +6,7 @@ module InitLib
 
   # Check git.
   def _init_lib_git_check
-    return false unless command_available_else_error? config.active['cmd_git']
+    return false unless command_available_else_error? config.active['cmd_git_check']
     return true unless git_check_workspace
 
     log.error 'git is already initialized!'

data/lib/takeltau/lib/config.rb

@@ -19,7 +19,7 @@ module ConfigModule
     end
   end
 
-  # Initialze config
+  # Initialize config
   # rubocop:disable Metrics/AbcSize
   def initialize_config
     project_root_dir = _get_project_root_dir
@@ -136,34 +136,27 @@ module ConfigModule
 
   # Get project root directory.
   # @return [String] project root directory
+  # rubocop:disable Metrics/MethodLength
   def _get_project_root_dir
-    return ENV['TAKELAGE_TAU_DIR'] if ENV.key? 'TAKELAGE_TAU_DIR'
-
-    log.debug 'Environment variable TAKELTAU_TAU_DIR not set.'
+    if ENV.key? 'TAKELAGE_TAU_DIR'
+      log.debug "TAKELTAU_TAU_DIR is set to \"#{ENV['TAKELAGE_TAU_DIR']}\""
+      return ENV['TAKELAGE_TAU_DIR']
+    end
 
     tau_takelage_root_dir = _get_takelage_root_dir
-    return tau_takelage_root_dir unless tau_takelage_root_dir.nil?
-
-    log.debug 'No "Rakefile" found. Cannot determine takelage project root directory.'
-
-    takelship_root_dir = _get_takelship_root_dir
-    return takelship_root_dir unless takelship_root_dir.nil?
+    unless tau_takelage_root_dir.nil?
+      log.debug "Rakefile found in \"#{tau_takelage_root_dir}\""
+      return tau_takelage_root_dir
+    end
 
-    log.debug 'Not in takelship mode. Unable to determine root directory.'
-    ''
+    log.debug "Setting root dir to current working dir \"#{Dir.pwd}\""
+    Dir.pwd
   end
+  # rubocop:enable Metrics/MethodLength
 
   # Return a takelage root dir
   def _get_takelage_root_dir
     _rakefile, path_rakefile = Rake.application.find_rakefile_location
     path_rakefile
   end
-
-  # Return a takelship root dir
-  def _get_takelship_root_dir
-    return nil if ENV['TAKELAGE_TAU_SHIP'].nil?
-
-    log.debug 'Invoked in takelship mode. Using current working directory as root directory.'
-    Dir.pwd
-  end
 end

data/lib/takeltau/lib/project.rb

@@ -2,7 +2,7 @@
 
 # tau project module
 module ProjectModule
-  # tau config class.
+  # tau project class.
   class TakeltauProject
     include Singleton
     include LoggingModule

data/lib/takeltau/lib/system.rb

@@ -18,17 +18,6 @@ module SystemModule
     command_available command
   end
 
-  # Check if a command is available else log warning message
-  # @return [Boolean] is the command available?
-  def command_available_else_warn?(command)
-    unless _command_available? command
-      log.warn "The command \"#{command}\" is not available"
-      return false
-    end
-
-    command_available command
-  end
-
   # Convert hash to yaml.
   # @return [String] yaml of hash
   def hash_to_yaml(hash)
@@ -86,7 +75,7 @@ module SystemModule
   # @return [[String, String, Integer]] array of
   # stdout, stderr, exitstatus of command
   def run_and_capture(command)
-    log.debug "Running amd capturing command \"#{command}\""
+    log.debug "Running and capturing command \"#{command}\""
     stdout_str, stderr_str, status = Open3.capture3 command
     log.debug "Command \"#{command}\" has stdout:\n\"\"\"\n#{stdout_str}\"\"\""
     log.debug "Command \"#{command}\" has stderr:\n\"\"\"\n#{stderr_str}\"\"\""
@@ -123,20 +112,39 @@ module SystemModule
   private
 
   # Check if command is available
+  # rubocop:disable Metrics/MethodLength
   def _command_available?(command)
-    return true if instance_variable_get("@command_available_#{command}")
+    return true if _command_already_checked command
 
     log.debug "Check if the command \"#{command}\" is available"
-    status = try "#{command} version"
-    return false unless status.exitstatus.zero?
-
+    begin
+      status = try command
+      return false unless status.exitstatus.zero?
+    rescue Errno::ENOENT => e
+      log.debug 'The command failed with an error.'
+      log.debug "Class of error: #{e.class}"
+      log.debug "Error message: #{e.message}"
+      return false
+    end
     true
   end
+  # rubocop:enable Metrics/MethodLength
+
+  # Check if command has already been checked
+  def _command_already_checked(command)
+    digest = Digest::SHA256.bubblebabble command
+    command_hash = digest[0..4]
+    return true if instance_variable_get("@command_available_#{command_hash}")
+
+    false
+  end
 
   # Command is available
   def command_available(command)
     log.debug "The command \"#{command}\" is available"
-    instance_variable_set("@command_available_#{command}", true)
+    digest = Digest::SHA256.bubblebabble command
+    command_hash = digest[0..4]
+    instance_variable_set("@command_available_#{command_hash}", true)
   end
 
   # Check if file exists.

data/lib/takeltau/mutagen/check/daemon.rb

@@ -7,13 +7,11 @@ module MutagenCheckDaemon
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def mutagen_check_daemon
-    return true if @mutagen_daemon_available
-
     log.debug 'Check mutagen status'
 
-    return false unless command_available_else_error? config.active['cmd_mutagen']
+    return false unless command_available_else_error? config.active['cmd_mutagen_check']
 
-    # are we inside a takelage container?
+    # Are we inside a takelage container?
     unless _docker_container_lib_check_matrjoschka
       unless _file_exists? config.active['mutagen_socket_path_mutagen_host']
         log.error 'The mutagen socket path on the host is not available'
@@ -21,7 +19,6 @@ module MutagenCheckDaemon
       end
 
       log.debug 'The mutagen daemon is available'
-      @mutagen_daemon_available = true
       return true
     end
 
@@ -36,7 +33,6 @@ module MutagenCheckDaemon
     end
 
     log.debug 'The mutagen daemon is available'
-    @mutagen_daemon_available = true
     true
   end
   # rubocop:enable Metrics/AbcSize

data/lib/takeltau/mutagen/cli.rb

@@ -3,6 +3,24 @@
 module Takeltau
   # tau mutagen
   class Mutagen < SubCommandBase
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+    include DockerContainerLib
+    include MutagenCheckDaemon
+
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      log.debug 'Check docker dameon for mutagen subcommand'
+      exit false unless docker_check_daemon
+
+      log.debug 'Check mutagen dameon for mutagen subcommand'
+      exit false unless mutagen_check_daemon
+    end
+
     desc 'check [COMMAND]', 'Check mutagen'
     subcommand 'check', MutagenCheck
 

data/lib/takeltau/self/config/cli.rb

@@ -62,6 +62,23 @@ module Takeltau
       true
     end
 
+    #
+    # config envvars
+    #
+    desc 'envvars', 'Print envvars takeltau configuration'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print envvars takeltau configuration
+    This command will print the configuration
+    read from environment variables
+    LONGDESC
+    # Print envvars takeltau configuration.
+    def envvars
+      config_envvars_yaml = hash_to_yaml(config.envvars)
+      exit false if config_envvars_yaml == false
+      say config_envvars_yaml
+      true
+    end
+
     #
     # config active
     #

data/lib/takeltau/ship/cli.rb

@@ -3,6 +3,19 @@
 module Takeltau
   # tau ship
   class Ship < SubCommandBase
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+
+    def initialize(args = [], local_options = {}, configuration = {})
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      log.debug 'Check docker dameon for ship subcommand'
+      exit false unless docker_check_daemon 'cmd_ship_docker', 'cmd_ship_docker_check'
+    end
+
     desc 'completion [COMMAND] ', 'Print shell completion code'
     subcommand 'completion', ShipCompletion
 
@@ -19,12 +32,6 @@ module Takeltau
     # Top-level ship commands
     #
 
-    desc 'config', 'Alias for tau self config active'
-    # tau config: {Takeltau::SelfConfig#active}
-    def config
-      Takeltau::SelfConfig.new.active
-    end
-
     desc 'list', 'Alias for tau ship container list'
     # ship list: {Takeltau::ShipContainer#list}
     def list

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

@@ -8,8 +8,6 @@ module ShipContainerCheckExisting
     ship_hostname = _ship_container_lib_ship_hostname
     log.debug "Checking if takelship \"#{ship_hostname}\" is existing"
 
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     stdout_str = run _ship_container_cmd_check_existing ship_hostname
 
     if stdout_str.to_s.chomp.empty?
@@ -26,9 +24,9 @@ module ShipContainerCheckExisting
   # Format command to check if ship container exists.
   def _ship_container_cmd_check_existing(ship_hostname)
     format(
-      config.active['cmd_ship_container_check_existing_docker_ps'],
-      ship_docker: config.active['cmd_ship_docker'],
-      ship_name: ship_hostname
+      config.active['cmd_docker_container_check_existing_docker_ps'],
+      docker: config.active['cmd_ship_docker'],
+      container: ship_hostname
     )
   end
 end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# tau ship container clean
+module ShipContainerClean
+  # Remove all takelship containers
+  def ship_container_clean
+    _ship_container_clean_remove_containers
+  end
+
+  private
+
+  # Remove all takelship containers
+  # rubocop:disable Metrics/MethodLength
+  def _ship_container_clean_remove_containers
+    ship_name = config.active['ship_name']
+    log.debug "Getting all #{ship_name} containers"
+
+    cmd_docker_get = format(
+      config.active['cmd_docker_container_get_containers'],
+      docker: config.active['cmd_docker'],
+      docker_repo: ship_name
+    )
+
+    containers = (run cmd_docker_get).split(/\n+/)
+    containers.each do |container|
+      _ship_container_lib_remove_container container
+    end
+  end
+  # rubocop:enable Metrics/MethodLength
+end

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

@@ -6,27 +6,40 @@ module Takeltau
     include LoggingModule
     include SystemModule
     include ConfigModule
-    include DockerCheckDaemon
     include DockerContainerLib
     include ShipInfoLib
     include ShipContainerCheckExisting
     include ShipContainerLib
+    include ShipContainerClean
     include ShipContainerList
     include ShipContainerLogin
     include ShipContainerPodman
+    include ShipContainerStop
     include ShipContainerUpdate
 
     desc 'check [COMMAND]', 'Check takelship container'
     subcommand 'check', ShipContainerCheck
 
+    #
+    # ship container clean
+    #
+    desc 'clean', 'Stop all takelship containers'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+      Stop all takelship containers
+    LONGDESC
+    # Stop all takelship containers.
+    def clean
+      ship_container_clean
+    end
+
     #
     # ship container list
     #
-    desc 'list', 'list command'
+    desc 'list', 'List takelship containers'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
-      Run list command
+      List takelage containers
     LONGDESC
-    # Run list command.
+    # List takelage containers.
     def list
       say ship_container_list
     end
@@ -55,6 +68,18 @@ module Takeltau
       say ship_container_podman args
     end
 
+    #
+    # ship container stop
+    #
+    desc 'stop', 'Stop takelship container'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+      Stop takelship container
+    LONGDESC
+    # Stop takelship container.
+    def stop
+      ship_container_stop
+    end
+
     #
     # ship container update
     #

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

@@ -6,8 +6,6 @@ module ShipContainerLib
 
   # Run nonprivileged docker command
   def _ship_container_lib_docker_nonprivileged(command)
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_nonprivileged'],
       ship_docker: config.active['cmd_ship_docker'],
@@ -21,8 +19,6 @@ module ShipContainerLib
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
   def _ship_container_lib_docker_privileged(ports, command)
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     ship_data_dir = config.active['ship_data_dir']
     ship_env = config.active['ship_env']
     ports = _ship_container_lib_publish(ports)
@@ -45,8 +41,6 @@ module ShipContainerLib
 
   # Run a docker command in a takelship container
   def _ship_container_lib_docker(command, tty = '--tty')
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     cmd_docker_run_command = format(
       config.active['cmd_ship_container_docker'],
       ship_docker: config.active['cmd_ship_docker'],
@@ -57,20 +51,6 @@ module ShipContainerLib
     run_and_exit cmd_docker_run_command
   end
 
-  # Run takelship docker stop command
-  def _ship_container_lib_docker_stop
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
-    return false unless ship_container_check_existing
-
-    cmd_docker_stop_command = format(
-      config.active['cmd_ship_project_start_docker_stop'],
-      ship_docker: config.active['cmd_ship_docker'],
-      ship_hostname: _ship_container_lib_ship_hostname
-    )
-    run cmd_docker_stop_command
-  end
-
   # Return takelship image
   def _ship_container_lib_image
     ship_user = config.active['ship_user']
@@ -133,4 +113,15 @@ module ShipContainerLib
 
     run cmd_get_mounted_dir
   end
+
+  # Remove takelship container
+  def _ship_container_lib_remove_container(container)
+    cmd_docker_remove_container = format(
+      config.active['cmd_docker_container_stop_container'],
+      docker: config.active['cmd_docker'],
+      container: container
+    )
+
+    run cmd_docker_remove_container
+  end
 end

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

@@ -6,8 +6,6 @@ module ShipContainerList
   def ship_container_list
     log.debug 'List takelship containers'
 
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     _ship_container_list_get_inventory.to_yaml
   end
 
@@ -16,10 +14,12 @@ module ShipContainerList
   # Get the current inventory
   def _ship_container_list_get_inventory
     ship_name = config.active['ship_name']
+    destination = '/home/podman/takelship'
+    ship_docker = config.active['cmd_ship_docker']
     inventory = _ship_container_list_new_inventory ship_name
     _ship_container_lib_get_containers.each do |container|
-      name = _docker_container_lib_get_container_name_by_id container
-      dir = _ship_container_lib_get_mounted_dir.strip
+      name = (_docker_container_lib_get_container_name_by_id container).strip
+      dir = _docker_container_lib_get_mounted_dir name, destination, ship_docker
       inventory[ship_name]['hosts'] << { name => dir }
     end
     inventory

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

@@ -4,8 +4,6 @@
 module ShipContainerLogin
   # Run a login command in a takelship
   def ship_container_login
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     return false unless ship_container_check_existing
 
     command_after_login = config.active['cmd_ship_container_login']

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

@@ -4,8 +4,6 @@
 module ShipContainerPodman
   # Run a podman command in a takelship
   def ship_container_podman(args)
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     return false unless ship_container_check_existing
 
     _ship_container_lib_docker "pod podman #{args.join(' ')}"

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# tau ship container stop
+module ShipContainerStop
+  # Stop a takelship container
+  def ship_container_stop
+    _ship_container_stop_docker_stop
+  end
+
+  private
+
+  # Run takelship docker stop command
+  def _ship_container_stop_docker_stop
+    return false unless ship_container_check_existing
+
+    cmd_docker_stop_command = format(
+      config.active['cmd_ship_project_start_docker_stop'],
+      ship_docker: config.active['cmd_ship_docker'],
+      ship_hostname: _ship_container_lib_ship_hostname
+    )
+    run cmd_docker_stop_command
+  end
+end

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

@@ -4,8 +4,6 @@
 module ShipContainerUpdate
   # Update takelship image.
   def ship_container_update
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     cmd_docker_pull = _ship_container_update_cmd_docker_pull
 
     cmd_docker_remove_dangling = format(

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

@@ -10,6 +10,7 @@ module Takeltau
     include DockerContainerLib
     include ShipContainerCheckExisting
     include ShipContainerLib
+    include ShipContainerStop
     include ShipInfoLib
     include ShipProjectList
     include ShipProjectStart
@@ -47,7 +48,7 @@ module Takeltau
     LONGDESC
     # Stop a takelship container.
     def stop
-      say _ship_container_lib_docker_stop
+      say ship_container_stop
     end
   end
 end

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

@@ -4,13 +4,14 @@
 module ShipProjectStart
   # Start a takelship
   def ship_project_start(project)
-    return false unless docker_check_daemon 'cmd_ship_docker'
-
     return false if _docker_container_lib_check_matrjoschka
 
     return false if ship_container_check_existing
 
     takelship = _ship_info_lib_get_takelshipinfo
+
+    return false unless takelship.key? 'default_project'
+
     project = config.active['ship_default_project'] if project == 'default'
     project = takelship['default_project'] if project == 'default'
 
@@ -25,6 +26,7 @@ module ShipProjectStart
 
   # Get takelship ports
   # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
   def _ship_project_start_ports(takelship, project)
     ports = []
     takelship['projects'].each do |takelship_project|
@@ -38,9 +40,12 @@ module ShipProjectStart
         end
       end
     end
-    # add DOCKER_HOST port
-    ports << config.active['ship_docker_host']
+    if config.active['ship_port_expose_podman_socket'] == 'true'
+      log.debug "Add DOCKER_HOST port #{config.active['ship_docker_host']}"
+      ports << config.active['ship_docker_host']
+    end
     ports
   end
 end
+# rubocop:enable Metrics/AbcSize
 # rubocop:enable Metrics/MethodLength

data/lib/takeltau/version

@@ -1 +1 @@
-0.43.16
+0.43.19

data/lib/takeltau.rb

@@ -89,8 +89,10 @@ require_relative 'takeltau/ship/container/check/existing'
 require_relative 'takeltau/ship/container/check/cli'
 require_relative 'takeltau/ship/info/lib'
 require_relative 'takeltau/ship/container/list'
+require_relative 'takeltau/ship/container/clean'
 require_relative 'takeltau/ship/container/login'
 require_relative 'takeltau/ship/container/podman'
+require_relative 'takeltau/ship/container/stop'
 require_relative 'takeltau/ship/container/update'
 require_relative 'takeltau/ship/container/cli'
 require_relative 'takeltau/ship/info/cli'
@@ -136,12 +138,6 @@ module Takeltau
       # Initialize global singleton project
       initialize_project
 
-      # Set defaults
-      @docker_daemon_running = false
-      @command_available_docker = false
-      @mutagen_daemon_available = false
-      @command_available_mutagen = false
-
       # fylla bash completion code
       @bash_fylla = Fylla.bash_completion self
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.43.16
+  version: 0.43.19
 platform: ruby
 authors:
 - Takelwerk
@@ -288,11 +288,13 @@ files:
 - lib/takeltau/ship/completion/cli.rb
 - lib/takeltau/ship/container/check/cli.rb
 - lib/takeltau/ship/container/check/existing.rb
+- lib/takeltau/ship/container/clean.rb
 - lib/takeltau/ship/container/cli.rb
 - lib/takeltau/ship/container/lib.rb
 - lib/takeltau/ship/container/list.rb
 - lib/takeltau/ship/container/login.rb
 - lib/takeltau/ship/container/podman.rb
+- lib/takeltau/ship/container/stop.rb
 - lib/takeltau/ship/container/update.rb
 - lib/takeltau/ship/info/cli.rb
 - lib/takeltau/ship/info/lib.rb