takeltau 0.39.0 → 0.39.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f3cdc1423e876043ceea53b0e7209589e7b5474ad44b1213cbffa6336ad7af
-  data.tar.gz: 83a3dfa517ac84b8265a09b64b325184473fd0a22bf98fd241f4713e7e59c0ce
+  metadata.gz: d954acca5a410dcd961154463864bc7368752fcae20f2ef837a3a8de71cdce78
+  data.tar.gz: 51fdda97c3c74121a4b0c6e6302b75941304b2676c0f3fbaa11384c7fa292334
 SHA512:
-  metadata.gz: 923b34a21ed9d509f88be302e3c4e8682adae221d60f59a6a092ba706501ed5de13125a0184e0d7d26130441aeb84c015be119ec9e5a313a4078c11bf17de7e0
-  data.tar.gz: 83eec4fbdd1c53604dce8d1d53fab8d3c94678f997611f294afd6d833dcabcf78315337e427af44234f2562d8c4006d76eb585cdd2ff09afbeef8077d44b168a
+  metadata.gz: f7c3d8d019d6d433d04f3ebe58edc227503b4212f19af3ebdf3cf155b26ac831f29a1d158314312f8490a2a41b58cd76de8d0df57e0de9e0ff62bcd393233c3b
+  data.tar.gz: ddbd01a435c6409566286153fc9feb11721eb743e7d1634011f3766c7f8342eba67c66ef3e546cdb2b52eaa0097410c26d8cf0c36fe94e940fef965ce9a52b1f

data/lib/takeltau/default.yml

@@ -4,7 +4,7 @@ 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 %{dockersock}:/var/run/docker.sock --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 %{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}}"'
@@ -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,13 +46,13 @@ 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}'
 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}"'
-docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
+docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: '.config/gcloud'
 docker_entrypoint_options: ''
 docker_registry: 'https://registry.hub.docker.com'
@@ -65,10 +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/cli.rb

@@ -22,6 +22,7 @@ module Takeltau
     include MutagenCheckDaemon
     include MutagenSocketCheck
     include MutagenSocketCreate
+    include MutagenSocketDocker
     include MutagenSocketTerminate
 
     # Initialize docker container
@@ -40,6 +41,7 @@ module Takeltau
       @hostname = _docker_container_lib_hostname
       @hostlabel = "hostname=#{@hostname}"
       @takellabel = config.active['mutagen_socket_takelage_label']
+      @dockersock_host = config.active['mutagen_socket_path_docker_host']
       @mutagensock_container = config.active['mutagen_socket_path_mutagen_container']
       @mutagensock_host = config.active['mutagen_socket_path_mutagen_host']
       @gpgsock_container = config.active['mutagen_socket_path_gpg_container']

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

@@ -8,8 +8,7 @@ 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
     mutagen_socket_create 'ssh', @sshsock_container, @sshsock_host
@@ -91,7 +90,6 @@ module DockerContainerLib
       config.active['cmd_docker_container_create'],
       container: container,
       docker_run_options: config.active['docker_run_options'],
-      dockersock: '/var/run/docker.sock',
       entrypoint: entrypoint,
       entrypoint_options: config.active['docker_entrypoint_options'],
       extra: config.active['docker_entrypoint_extra'],

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/init/packer/templates/playbooksiteyml.tt

@@ -3,4 +3,4 @@
   hosts: all
   gather_facts: false
   roles:
-    - takel-cleanup
+    - takel_cleanup

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/cli.rb

@@ -17,6 +17,7 @@ module Takeltau
     include MutagenCheckDaemon
     include MutagenSocketCheck
     include MutagenSocketCreate
+    include MutagenSocketDocker
     include MutagenSocketList
     include MutagenSocketTidy
     include MutagenSocketTerminate
@@ -61,6 +62,18 @@ module Takeltau
       exit mutagen_socket_create name, containersock, hostsock
     end
 
+    #
+    # mutagen socket create
+    #
+    desc 'docker [OUT]', 'Create a mutagen docker socket [OUT] of the container'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Create a mutagen docker socket [OUT] of the container
+    LONGDESC
+    # Create a mutagen docker socket [OUT] of the container.
+    def docker(hostsock)
+      exit mutagen_socket_docker hostsock
+    end
+
     #
     # mutagen socket list
     #

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# tau mutagen socket docker
+module MutagenSocketDocker
+  # Backend method for mutagen socket docker.
+  # rubocop:disable Metrics/MethodLength
+  def mutagen_socket_docker(hostsock)
+    # See DockerContainerLib::_docker_container_lib_hostname
+    socketname = "#{@hostname[-11..-1]}-docker"
+    log.debug "Create the mutagen docker socket \"#{socketname}\" in the container " \
+      "pointing to the host at \"#{hostsock}\""
+
+    return false if mutagen_socket_check socketname
+
+    socket_created = _mutagen_socket_docker_socket(socketname, hostsock)
+
+    unless socket_created.include? 'Created session'
+      log.debug "Unable to create mutagen docker socket \"#{socketname}\""
+      return false
+    end
+
+    log.debug "Created the mutagen docker socket \"#{socketname}\""
+    true
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  private
+
+  # Get git branch.
+  def _mutagen_socket_docker_socket(socketname, hostsock)
+    cmd_create_socket = format(
+      config.active['cmd_mutagen_forward_socket_docker'],
+      socketname: socketname,
+      hostsock: hostsock,
+      container: @hostname,
+      hostlabel: @hostlabel,
+      takellabel: @takellabel
+    )
+    run cmd_create_socket
+  end
+end

data/lib/takeltau/version

@@ -1 +1 @@
-0.39.0
+0.39.16

data/lib/takeltau.rb

@@ -40,6 +40,7 @@ require_relative 'takeltau/init/cli'
 require_relative 'takeltau/mutagen/check/daemon'
 require_relative 'takeltau/mutagen/socket/check'
 require_relative 'takeltau/mutagen/socket/create'
+require_relative 'takeltau/mutagen/socket/docker'
 require_relative 'takeltau/mutagen/socket/terminate'
 require_relative 'takeltau/mutagen/socket/tidy'
 require_relative 'takeltau/docker/check/daemon'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.39.16
 platform: ruby
 authors:
 - Takelwerk
@@ -272,6 +272,7 @@ files:
 - lib/takeltau/mutagen/socket/check.rb
 - lib/takeltau/mutagen/socket/cli.rb
 - lib/takeltau/mutagen/socket/create.rb
+- lib/takeltau/mutagen/socket/docker.rb
 - lib/takeltau/mutagen/socket/list.rb
 - lib/takeltau/mutagen/socket/terminate.rb
 - lib/takeltau/mutagen/socket/tidy.rb