takeltau 0.43.2 → 0.43.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f155e82696808efbb960be240378c95cf81293a3fc6f8a77b5ebb5b94ec553c
-  data.tar.gz: bb436721278cf181fcc184f5fcc44b78b571eced96e20fde3db640f9d0598d9a
+  metadata.gz: 1effdb4d73aed5fa0951640c5fa19b918982cba11e0b6a5b5460dd77ab5e7aba
+  data.tar.gz: b304a9a5c2cbc8d039d3702da6ae6dc6ad5b6949adc82f3082819b476fc99975
 SHA512:
-  metadata.gz: 6d2f45c3ef3c0cf310eec89a6b1b59350e270489fd62a8964fa5b1f8f23e1d2a925f93325ca1ecb41cbde589353ceaf1c91033c06aa667727d55af430cdf2764
-  data.tar.gz: f09ba20dd55601707f26b5b6df6788150887baa296314e83407caa4f22f8b02ef131b713627ac826e65c5611bc8e3f5c2f80451a476d92f03cbff8c13af17948
+  metadata.gz: 1754ef934d158c1d6e803f3585729ba0e02ca156f26328d8a8e9cdbd66cd63269c2be924f6f3ced93512d1a609aafdd8f197ecafd190318c6b240e786ff60c92
+  data.tar.gz: f9a87e07f7879077f2c29505c1a1e6e20f7be8f0d1df0360cb6bfeb39af7fc6241be7cf9f8356b989422ee9b3749f34fc0d76b7533004596b8afa6cda74eeba6

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
@@ -39,5 +40,17 @@ module Takeltau
     def podman(*args)
       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/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

@@ -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/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.2
+0.43.6

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.2
+  version: 0.43.6
 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