takeltau 0.43.4 → 0.43.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cdb220b7874487429d18e9ede745ea04c1dc35af067370704c76ffb3a131021
-  data.tar.gz: 78463c6094e410eb4ba7d8b9f420d0e048eec0eef77ad3f3a5262a6711b7a9c9
+  metadata.gz: 1e3cfcc5190c832bb598a7995d870a9ad8ffbd2d80cc27d40716a2c8f48234e9
+  data.tar.gz: 2329865f99624b7107046aeb8662ba7116e6ab2a5b92045f11a39bde8d38999a
 SHA512:
-  metadata.gz: 713a8e1ee38ae073bc477750f71f42159fb43d0730c017fb79f7324ad9a29bdff580c071cf184d0326c468b2a54d92a0348418be0d3db63983f5c3014398e34c
-  data.tar.gz: 0c8254b074c148a97331f7eb527a0dae333e04ca779fe0bac392a529b104685d0f67845acca509d8868fe3413528edca0d6cc6ec0f7cde0136679482eb9fe523
+  metadata.gz: c85f8b70f10c8982e88bb08bab002c22e5efdaa4dc8e4652ba87733ab9c0b8e34dd38923e402a8564de1a827fe487877b56733a19d7574f99f26a5d08f6419c4
+  data.tar.gz: b64fe24cc6176b74ebe52f7d6010103bf1b060cd411dacb59c207999839971379a38409e0d65b0947dbd30136af01c7f8841c329e74294203ef774770ef4bd32

data/lib/takeltau/default.yml

@@ -1,21 +1,21 @@
 ---
 cmd_docker: 'docker'
-cmd_docker_check_daemon_docker_info: 'docker info'
-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_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_network: 'docker network create %{network}'
-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_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_docker_check_daemon_docker_info: '%{docker} info'
+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_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_network: '%{docker} network create %{network}'
+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_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'
@@ -87,10 +87,9 @@ 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_project_start_docker_run_nonprivileged: 'docker run --rm --interactive %{image} %{command}'
-cmd_ship_project_start_docker_run_privileged: '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: 'docker stop %{ship_hostname}'
-cmd_ship_container_check_existing_docker_ps: 'docker ps --filter name=^%{ship_name}$ --quiet'
-cmd_ship_container_docker: 'docker exec --interactive %{tty} %{ship_hostname} %{command}'
-cmd_ship_container_podman: 'DOCKER_HOST=tcp://%{localhost}:%{docker_host} docker %{command}'
+cmd_ship_project_start_docker_run_nonprivileged: '%{docker} run --rm --interactive %{image} %{command}'
+cmd_ship_project_start_docker_run_privileged: '%{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: '%{docker} stop %{ship_hostname}'
+cmd_ship_container_check_existing_docker_ps: '%{docker} ps --filter name=^%{ship_name}$ --quiet'
+cmd_ship_container_docker: '%{docker} exec --interactive %{tty} %{ship_hostname} %{command}'
 cmd_ship_container_login: 'bash'

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

@@ -5,6 +5,7 @@ module DockerCheckDaemon
   # Backend method for docker check daemon.
   # @return [Boolean] is the docker daemon running?
   # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
   def docker_check_daemon
     return true if @docker_daemon_running
 
@@ -12,7 +13,11 @@ module DockerCheckDaemon
 
     log.debug 'Check if the docker daemon is running'
 
-    status = try config.active['cmd_docker_check_daemon_docker_info']
+    cmd_docker_info = format(
+      config.active['cmd_docker_check_daemon_docker_info'],
+      docker: config.active['cmd_docker']
+    )
+    status = try cmd_docker_info
 
     unless status.exitstatus.zero?
       log.error 'The docker daemon is not running'
@@ -23,5 +28,6 @@ module DockerCheckDaemon
     @docker_daemon_running = true
     true
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 end

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

@@ -27,6 +27,7 @@ module DockerContainerCheckExisting
   def _docker_container_cmd_check_existing(container)
     format(
       config.active['cmd_docker_container_check_existing_docker_ps'],
+      docker: config.active['cmd_docker'],
       container: container
     )
   end

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

@@ -26,6 +26,7 @@ module DockerContainerCheckNetwork
   def _docker_container_cmd_check_network(network)
     format(
       config.active['cmd_docker_container_check_network_docker_network'],
+      docker: config.active['cmd_docker'],
       network: network
     )
   end

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

@@ -26,6 +26,7 @@ module DockerContainerCheckOrphaned
   def _docker_container_cmd_check_orphaned(container)
     format(
       config.active['cmd_docker_container_check_orphaned_docker_exec'],
+      docker: config.active['cmd_docker'],
       container: container
     )
   end

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

@@ -28,6 +28,7 @@ module DockerContainerCommand
     cmd_docker_run_command =
       format(
         config.active['cmd_docker_container_docker_exec'],
+        docker: config.active['cmd_docker'],
         container: container,
         username: @username,
         command: command

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

@@ -48,6 +48,7 @@ module DockerContainerLib
 
     cmd_create_network = format(
       config.active['cmd_docker_container_create_network'],
+      docker: config.active['cmd_docker'],
       network: network
     )
 
@@ -60,6 +61,7 @@ module DockerContainerLib
 
     cmd_remove_network = format(
       config.active['cmd_docker_container_remove_network'],
+      docker: config.active['cmd_docker'],
       network: network
     )
 
@@ -88,6 +90,7 @@ module DockerContainerLib
 
     cmd_docker_create = format(
       config.active['cmd_docker_container_create'],
+      docker: config.active['cmd_docker'],
       container: container,
       docker_run_options: config.active['docker_run_options'],
       entrypoint: entrypoint,
@@ -138,6 +141,7 @@ module DockerContainerLib
 
     cmd_get_container_name_by_id = format(
       config.active['cmd_docker_container_get_container_name'],
+      docker: config.active['cmd_docker'],
       container: container
     )
 
@@ -153,6 +157,7 @@ module DockerContainerLib
 
     cmd_docker_get = format(
       config.active['cmd_docker_container_get_containers'],
+      docker: config.active['cmd_docker'],
       docker_repo: @docker_repo
     )
 
@@ -166,6 +171,7 @@ module DockerContainerLib
 
     cmd_docker_stop = format(
       config.active['cmd_docker_container_stop_container'],
+      docker: config.active['cmd_docker'],
       container: container
     )
 

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

@@ -41,6 +41,7 @@ module DockerContainerLogin
 
     format(
       config.active['cmd_docker_container_enter_container'],
+      docker: config.active['cmd_docker'],
       container: container,
       loginpoint: loginpoint,
       username: @username

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

@@ -25,10 +25,12 @@ module DockerImageTagCheck
   private
 
   # Check if image exists.
+  # rubocop:disable Metrics/MethodLength
   def _docker_image_check_image?(image)
     cmd_docker_images =
       format(
         config.active['cmd_docker_image_tag_check_docker_images'],
+        docker: config.active['cmd_docker'],
         image: image
       )
 
@@ -39,4 +41,5 @@ module DockerImageTagCheck
 
     true
   end
+  # rubocop:enable Metrics/MethodLength
 end

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

@@ -8,6 +8,7 @@ module DockerImageTagList
     cmd_docker_tags =
       format(
         config.active['cmd_docker_image_tag_list_docker_images'],
+        docker: config.active['cmd_docker'],
         docker_user: @docker_user,
         docker_repo: @docker_repo
       )

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

@@ -8,8 +8,10 @@ module DockerImageUpdate
 
     cmd_docker_pull = _docker_image_update_cmd_docker_pull
 
-    cmd_docker_remove_dangling =
-      config.active['cmd_docker_image_update_docker_remove_dangling']
+    cmd_docker_remove_dangling = format(
+      config.active['cmd_docker_image_update_docker_remove_dangling'],
+      docker: config.active['cmd_docker']
+    )
 
     run_and_exit "#{cmd_docker_pull} && #{cmd_docker_remove_dangling}"
   end
@@ -20,6 +22,7 @@ module DockerImageUpdate
   def _docker_image_update_cmd_docker_pull
     format(
       config.active['cmd_docker_image_update_docker_pull'],
+      docker: config.active['cmd_docker'],
       docker_user: @docker_user,
       docker_repo: @docker_repo,
       docker_tag: @docker_tag

data/lib/takeltau/lib/system.rb

@@ -127,7 +127,7 @@ module SystemModule
     return true if instance_variable_get("@command_available_#{command}")
 
     log.debug "Check if the command \"#{command}\" is available"
-    status = try "which #{command}"
+    status = try "#{command} version"
     return false unless status.exitstatus.zero?
 
     true

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

@@ -27,6 +27,7 @@ module ShipContainerCheckExisting
   def _ship_container_cmd_check_existing(ship_hostname)
     format(
       config.active['cmd_ship_container_check_existing_docker_ps'],
+      docker: config.active['cmd_docker'],
       ship_name: ship_hostname
     )
   end

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

@@ -10,6 +10,7 @@ module ShipContainerLib
 
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_nonprivileged'],
+      docker: config.active['cmd_docker'],
       image: _ship_container_lib_image,
       command: command
     )
@@ -28,6 +29,7 @@ module ShipContainerLib
     ports = config.active['ports'] unless config.active['ship_ports'].empty?
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_privileged'],
+      docker: config.active['cmd_docker'],
       ship_hostname: _ship_container_lib_ship_hostname,
       ship_env: ship_env,
       ports: ports,
@@ -46,6 +48,7 @@ module ShipContainerLib
 
     cmd_docker_run_command = format(
       config.active['cmd_ship_container_docker'],
+      docker: config.active['cmd_docker'],
       ship_hostname: _ship_container_lib_ship_hostname,
       tty: tty,
       command: command
@@ -61,6 +64,7 @@ module ShipContainerLib
 
     cmd_docker_stop_command = format(
       config.active['cmd_ship_project_start_docker_stop'],
+      docker: config.active['cmd_docker'],
       ship_hostname: _ship_container_lib_ship_hostname
     )
     run cmd_docker_stop_command

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

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

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

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

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

@@ -8,8 +8,11 @@ module ShipContainerUpdate
 
     cmd_docker_pull = _ship_container_update_cmd_docker_pull
 
-    cmd_docker_remove_dangling =
-      config.active['cmd_docker_image_update_docker_remove_dangling']
+    cmd_docker_remove_dangling = format(
+      config.active['cmd_docker_image_update_docker_remove_dangling'],
+      docker: config.active['cmd_docker']
+    )
+
     run_and_exit "#{cmd_docker_pull} && #{cmd_docker_remove_dangling}"
   end
 
@@ -22,6 +25,7 @@ module ShipContainerUpdate
     ship_tag = config.active['ship_tag']
     format(
       config.active['cmd_docker_image_update_docker_pull'],
+      docker: config.active['cmd_docker'],
       docker_user: ship_user,
       docker_repo: ship_repo,
       docker_tag: ship_tag

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

@@ -4,10 +4,12 @@
 module ShipProjectStart
   # Start a takelship
   def ship_project_start(project)
-    return false if ship_container_check_existing
+    return false unless docker_check_daemon
 
     return false if _docker_container_lib_check_matrjoschka
 
+    return false if ship_container_check_existing
+
     takelship = _ship_info_lib_get_takelshipinfo
     project = config.active['ship_default_project'] if project == 'default'
     project = takelship['default_project'] if project == 'default'

data/lib/takeltau/version

@@ -1 +1 @@
-0.43.4
+0.43.10

metadata

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