takeltau 0.39.2 → 0.39.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efcd37beaf72d26ec96d9036cec64b14150b2b1b3685d30842aa3843ccb29b1e
-  data.tar.gz: 5018c78c0dd215eeb8a49b17c58e1230ed697957d1188fb2abdf33e906c3f219
+  metadata.gz: 7dccbd2450aef1f79fbfc296b79ebed9223848bace7a80ceb8bdc2128a3ef861
+  data.tar.gz: 7f143ed2fd998c2138aac52585561b4f7ad7e890c90d77fd47688a6e5d48b5e1
 SHA512:
-  metadata.gz: 6052b700a56b6c15f8c1c980a97ab47f10b33b9403f3266920f8aaa232b0dcb0a5db921df9863089b5f5440a7816c120b8169ff2be7b6306aed213562fa9acb5
-  data.tar.gz: a644c2d3082c2b1a6ed8a0ace6ce05e7b2bfbf327d7b118fd8201a668644e15c3791002edcd874bb0c98f467cceb699dc87dcbf2f3af8a4fd89e9b56c643054f
+  metadata.gz: 393eda28103aaa37bfb3538cc7fae38cb23af87473a93253d777cd299e62637b467c202e510acfd80c25ac77ff0cd4c6aa85aa10e95fc608ea512590297acdbf
+  data.tar.gz: d8e1129e3770078994b01a59259a5c3ab85f4be889070ed9c5fda239d4e01cf7f8b8a748c0fb4e8cbc96551636f386ae5d9b20e5ca1e8872a31ee47935868f82

data/lib/takeltau/default.yml

@@ -14,7 +14,7 @@ cmd_docker_container_docker_exec: 'docker exec %{container} su %{username} -c "L
 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_latest: 'docker pull %{docker_user}/%{docker_repo}:latest'
+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'
@@ -46,7 +46,6 @@ cmd_init_lib_git_commit_initial: 'git commit -m "Initial commit"'
 cmd_init_lib_hg_clone: 'bash hgclone'
 cmd_mutagen: 'mutagen'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
-cmd_mutagen_check_daemon_version: 'mutagen version'
 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}'
@@ -66,11 +65,11 @@ git_hg_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
 login_wait_for_sockets: '0'
-mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
-mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
 mutagen_socket_path_docker_host: '/var/run/docker.sock'
 mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
 mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
+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'

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

@@ -8,8 +8,6 @@ module DockerContainerLib
 
   # Create mutagen sockets
   def _docker_container_lib_start_sockets
-    return false unless mutagen_check_daemon
-
     mutagen_socket_docker @dockersock_host
     mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
     mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host

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

@@ -16,6 +16,7 @@ module Takeltau
 
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
+      @docker_tag = config.active['docker_tag']
       @docker_registry = config.active['docker_registry']
     end
 

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

@@ -6,22 +6,23 @@ module DockerImageUpdate
   def docker_image_update
     return false unless docker_check_daemon
 
-    cmd_docker_pull_latest = _docker_image_update_cmd_docker_pull_latest
+    cmd_docker_pull = _docker_image_update_cmd_docker_pull
 
     cmd_docker_remove_dangling =
       config.active['cmd_docker_image_update_docker_remove_dangling']
 
-    run_and_exit "#{cmd_docker_pull_latest} && #{cmd_docker_remove_dangling}"
+    run_and_exit "#{cmd_docker_pull} && #{cmd_docker_remove_dangling}"
   end
 
   private
 
   # Prepare dpcker pull latest command.
-  def _docker_image_update_cmd_docker_pull_latest
+  def _docker_image_update_cmd_docker_pull
     format(
-      config.active['cmd_docker_image_update_docker_pull_latest'],
+      config.active['cmd_docker_image_update_docker_pull'],
       docker_user: @docker_user,
-      docker_repo: @docker_repo
+      docker_repo: @docker_repo,
+      docker_tag: @docker_tag
     )
   end
 end

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

@@ -5,17 +5,18 @@ module MutagenCheckDaemon
   # Backend method for mutagen check daemon.
   # @return [Boolean] is mutagen available?
   # 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 _mutagen_check_check_prerequisites
+    return false unless command_available_else_error? config.active['cmd_mutagen']
 
-    # are we outside of a takelage container?
+    # are we inside a takelage container?
     unless _docker_container_lib_check_matrjoschka
-      unless _mutagen_check_daemon_version
-        log.error 'The mutagen daemon is not available'
+      unless _file_exists? config.active['mutagen_socket_path_mutagen_host']
+        log.error 'The mutagen socket path on the host is not available'
         return false
       end
 
@@ -24,6 +25,11 @@ module MutagenCheckDaemon
       return true
     end
 
+    unless _file_exists? config.active['mutagen_socket_path_mutagen_container']
+      log.error 'The mutagen socket path in the container is not available'
+      return false
+    end
+
     unless _mutagen_check_daemon_host_connection
       log.error 'A mutagen host connection is not available'
       return false
@@ -33,25 +39,11 @@ module MutagenCheckDaemon
     @mutagen_daemon_available = true
     true
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   private
 
-  # Check mutagen prerequisites
-  def _mutagen_check_check_prerequisites
-    unless _file_exists? config.active['mutagen_socket_path_mutagen_container']
-      log.error 'The mutagen socket path in the container is not available'
-      return false
-    end
-
-    unless _file_exists? config.active['mutagen_socket_path_mutagen_host']
-      log.error 'The mutagen socket path on the host is not available'
-      return false
-    end
-
-    command_available_else_error? config.active['cmd_mutagen']
-  end
-
   # Check mutagen host connection
   # rubocop:disable Metrics/MethodLength
   def _mutagen_check_daemon_host_connection
@@ -75,10 +67,4 @@ module MutagenCheckDaemon
     true
   end
   # rubocop:enable Metrics/MethodLength
-
-  # Check mutagen version
-  def _mutagen_check_daemon_version
-    version = try config.active['cmd_mutagen_check_daemon_version']
-    version.exitstatus.zero?
-  end
 end

data/lib/takeltau/mutagen/socket/create.rb

@@ -10,8 +10,6 @@ module MutagenSocketCreate
     log.debug "Create the mutagen socket \"#{socketname}\" in the container " \
       "at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
 
-    return false unless mutagen_check_daemon
-
     return false if mutagen_socket_check socketname
 
     socket_created = _mutagen_socket_create_socket(socketname, containersock, hostsock)

data/lib/takeltau/mutagen/socket/docker.rb

@@ -10,8 +10,6 @@ module MutagenSocketDocker
     log.debug "Create the mutagen docker socket \"#{socketname}\" in the container " \
       "pointing to the host at \"#{hostsock}\""
 
-    return false unless mutagen_check_daemon
-
     return false if mutagen_socket_check socketname
 
     socket_created = _mutagen_socket_docker_socket(socketname, hostsock)

data/lib/takeltau/version

@@ -1 +1 @@
-0.39.2
+0.39.18

metadata

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