takeltau 0.43.1 → 0.43.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ce8c9adb2444d89382171349bad2541743195640c773e0e50e9bda09b1a813
-  data.tar.gz: dc8467fd57e0e273b8c8df0390d3b206a88f4f86691e62f77ae59a5d59404b44
+  metadata.gz: 7cdb220b7874487429d18e9ede745ea04c1dc35af067370704c76ffb3a131021
+  data.tar.gz: 78463c6094e410eb4ba7d8b9f420d0e048eec0eef77ad3f3a5262a6711b7a9c9
 SHA512:
-  metadata.gz: 727b786c912e1f966f0e05c0ff6caa5b619e0c54da280ede84eab297913587ea9d18dff97793dee3ad232504d56da9fca12ff51eaa9c1a759e88f5190fffd703
-  data.tar.gz: 1a7eb0cd00dcef8b061f9fd2f12d03ce9e815d12e031e6309a8d582468b4c33bb3cf8d5b580ac412cce788fdf27e3cf87f7c1b7967952dc0aaf212bfffa928ee
+  metadata.gz: 713a8e1ee38ae073bc477750f71f42159fb43d0730c017fb79f7324ad9a29bdff580c071cf184d0326c468b2a54d92a0348418be0d3db63983f5c3014398e34c
+  data.tar.gz: 0c8254b074c148a97331f7eb527a0dae333e04ca779fe0bac392a529b104685d0f67845acca509d8868fe3413528edca0d6cc6ec0f7cde0136679482eb9fe523

data/lib/takeltau/default.yml

@@ -79,10 +79,8 @@ ship_hostname: '%{ship_name}_%{unique}'
 ship_default_project: 'default'
 ship_env: '--env TAKELSHIP_UPDATE=true'
 ship_ports: ''
-#ship_user: 'takelwerk'
-#ship_repo: 'takelship'
-ship_user: 'packer_local'
-ship_repo: 'takelship-project'
+ship_user: 'takelwerk'
+ship_repo: 'takelship'
 ship_tag: 'latest'
 ship_data_dir: 'takelship'
 ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/projects/takelship.yml'

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# tau docker image uppdate
+# tau docker image update
 module DockerImageUpdate
   # Backend method for docker image update.
   def docker_image_update

data/lib/takeltau/ship/cli.rb

@@ -48,5 +48,11 @@ module Takeltau
     def stop
       Takeltau::ShipProject.new.stop
     end
+
+    desc 'update', 'Alias for tau ship container update'
+    # tau update: {Takeltau::ShipContainer#update}
+    def update
+      Takeltau::ShipContainer.new.update
+    end
   end
 end

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

@@ -12,6 +12,7 @@ module Takeltau
     include ShipContainerLib
     include ShipContainerLogin
     include ShipContainerPodman
+    include ShipContainerUpdate
 
     desc 'check [COMMAND]', 'Check takelship container'
     subcommand 'check', ShipContainerCheck
@@ -37,12 +38,19 @@ module Takeltau
     LONGDESC
     # Run podman command.
     def podman(*args)
-      result = ship_container_podman args
-      unless result
-        say 'No connection to takelship'
-        exit 1
-      end
-      say result
+      say ship_container_podman args
+    end
+
+    #
+    # ship container update
+    #
+    desc 'update', 'Update takelship image'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+      Update takelship image
+    LONGDESC
+    # Update takelship image.
+    def update
+      ship_container_update
     end
   end
 end

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

@@ -40,30 +40,8 @@ module ShipContainerLib
   # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize
 
-  # Run a podman command in a takelship container
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
-  def _ship_container_lib_podman(command)
-    return false unless docker_check_daemon
-
-    docker_host = _ship_info_lib_get_takelshipinfo['docker_host']
-    config_docker_host = config.active['ship_docker_host']
-    docker_host = config_docker_host if
-      config_docker_host != config.active['ship_default_docker_host']
-    localhost = config.active['ship_podman_localhost']
-    cmd_docker_run_command = format(
-      config.active['cmd_ship_container_podman'],
-      docker_host: docker_host,
-      localhost: localhost,
-      command: command
-    )
-    run cmd_docker_run_command
-  end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable Metrics/MethodLength
-
   # Run a docker command in a takelship container
-  def _ship_container_lib_docker(command, tty = '')
+  def _ship_container_lib_docker(command, tty = '--tty')
     return false unless docker_check_daemon
 
     cmd_docker_run_command = format(

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

@@ -6,6 +6,6 @@ module ShipContainerPodman
   def ship_container_podman(args)
     return false unless ship_container_check_existing
 
-    _ship_container_lib_podman args.join(' ')
+    _ship_container_lib_docker "pod podman #{args.join(' ')}"
   end
 end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# tau ship container update
+module ShipContainerUpdate
+  # Update takelship image.
+  def ship_container_update
+    return false unless docker_check_daemon
+
+    cmd_docker_pull = _ship_container_update_cmd_docker_pull
+
+    cmd_docker_remove_dangling =
+      config.active['cmd_docker_image_update_docker_remove_dangling']
+    run_and_exit "#{cmd_docker_pull} && #{cmd_docker_remove_dangling}"
+  end
+
+  private
+
+  # Prepare dpcker pull latest command.
+  def _ship_container_update_cmd_docker_pull
+    ship_user = config.active['ship_user']
+    ship_repo = config.active['ship_repo']
+    ship_tag = config.active['ship_tag']
+    format(
+      config.active['cmd_docker_image_update_docker_pull'],
+      docker_user: ship_user,
+      docker_repo: ship_repo,
+      docker_tag: ship_tag
+    )
+  end
+end

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

@@ -7,6 +7,7 @@ module Takeltau
     include SystemModule
     include ConfigModule
     include DockerCheckDaemon
+    include DockerContainerLib
     include ShipContainerCheckExisting
     include ShipContainerLib
     include ShipInfoLib

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

@@ -6,6 +6,8 @@ module ShipProjectStart
   def ship_project_start(project)
     return false if ship_container_check_existing
 
+    return false if _docker_container_lib_check_matrjoschka
+
     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.1
+0.43.4

data/lib/takeltau.rb

@@ -90,6 +90,7 @@ require_relative 'takeltau/ship/container/check/cli'
 require_relative 'takeltau/ship/info/lib'
 require_relative 'takeltau/ship/container/login'
 require_relative 'takeltau/ship/container/podman'
+require_relative 'takeltau/ship/container/update'
 require_relative 'takeltau/ship/container/cli'
 require_relative 'takeltau/ship/info/cli'
 require_relative 'takeltau/ship/project/list'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.43.1
+  version: 0.43.4
 platform: ruby
 authors:
 - Takelwerk
@@ -292,6 +292,7 @@ files:
 - lib/takeltau/ship/container/lib.rb
 - lib/takeltau/ship/container/login.rb
 - lib/takeltau/ship/container/podman.rb
+- lib/takeltau/ship/container/update.rb
 - lib/takeltau/ship/info/cli.rb
 - lib/takeltau/ship/info/lib.rb
 - lib/takeltau/ship/project/cli.rb