takeltau 0.38.2 → 0.39.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cdad12eeefa3b06fdce78f798f07ddae95be2cd83e14e8bfc9159df38480a3e
-  data.tar.gz: 4f4be3e7401333306784e7f343cfd049633a3998d08871ceabd137af582f7243
+  metadata.gz: 80673a82149249c7b16503717deb9938a88f2f8b9a689c6f336a89a5709ed300
+  data.tar.gz: d07eb8a444b0c1e7ccefccdbb26aa9a19d7812f1f339e17a992588cf977ac748
 SHA512:
-  metadata.gz: 858ce1e3ace8d154329c0be1420a939116fc38cd8e56a9f73e431dac27bd43338a42db045bf32aed92d306d62a32328cd1fa6eae6f49c7cb5c192fa77b30cc29
-  data.tar.gz: fcd3ad170d599873e11803450f26b3065a593b1826cbc8b156caeee1e8659fc98523ca4668edec0cfd743a961d35586c374ddb13182fb95d7dd74faab8837042
+  metadata.gz: 169bf5afcc740f79acd671d220b9833305651214b44a1da98ea58b17dcd15b6e72ab118b6bbeedb575ce738bdd9bb3673d40fffaaa2bbabd7734e83512eb13df
+  data.tar.gz: 0ee76be9d69bfb7a702366600ef26af1299a8ee9d4b04bd1da63f7f9123905ec0347d0d39e3fdccf47287a3257f75d94cf8c269af881f6e48198ed6e7f7cd93b

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}}"'
@@ -46,13 +46,14 @@ 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_check_daemon_start_daemon: 'mutagen daemon start'
 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'
@@ -67,6 +68,7 @@ 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_ssh_container: '~/.gnupg/S.gpg-agent.ssh'

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

@@ -10,6 +10,7 @@ module DockerContainerLib
   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 +92,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'],
@@ -122,7 +122,6 @@ module DockerContainerLib
     end
 
     log.debug 'We are inside a takelage container'
-
     true
   end
 
@@ -145,9 +144,7 @@ module DockerContainerLib
     )
 
     name = (run cmd_get_container_name_by_id).chomp
-
     log.debug "Container #{container} has name \"#{name}\""
-
     name
   end
 

data/lib/takeltau/info/status/bar.rb

@@ -29,14 +29,10 @@ module InfoStatusBar
 
   # Add takelage version info to bar.
   def _info_status_bar_takelage
-    takelage_version_file = '/etc/takelage_version'
-    unless _file_exists? takelage_version_file
-      @bar_status = false
-      return false
-    end
+    # Check if we are inside a takelage docker container
+    return unless _docker_container_lib_check_matrjoschka
 
-    _file_read takelage_version_file
-    @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
+    @bar_list << _info_status_lib_get_channel_and_version
   end
 
   # Add tau version info to bar.

data/lib/takeltau/info/status/lib.rb

@@ -43,4 +43,18 @@ module InfoStatusLib
       )
     try cmd_git_key_available
   end
+
+  # Get takelage environment string
+  def _info_status_lib_get_channel_and_version
+    takelage_version_file = '/etc/takelage_version'
+    return '' unless _file_exists? takelage_version_file
+
+    _file_read takelage_version_file
+
+    channel = config.active['docker_repo']
+    version = @content_file.chomp
+
+    log.debug "#{channel}: #{version.green}"
+    "#{channel}: #{version.green}"
+  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,21 @@ 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
+    unless _mutagen_check_daemon_start
+      log.error 'The mutagen daemon cannot be started'
+      return false
+    end
 
-    # 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
 
@@ -29,6 +33,11 @@ module MutagenCheckDaemon
       return false
     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
+
     log.debug 'The mutagen daemon is available'
     @mutagen_daemon_available = true
     true
@@ -37,21 +46,6 @@ module MutagenCheckDaemon
 
   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
@@ -74,11 +68,12 @@ module MutagenCheckDaemon
 
     true
   end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
-  # Check mutagen version
-  def _mutagen_check_daemon_version
-    version = try config.active['cmd_mutagen_check_daemon_version']
-    version.exitstatus.zero?
+  # Start mutagen daemon
+  def _mutagen_check_daemon_start
+    start = try config.active['cmd_mutagen_check_daemon_start_daemon']
+    start.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/docker.rb

@@ -0,0 +1,43 @@
+# 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 unless mutagen_check_daemon
+
+    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.38.2
+0.39.11

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.38.2
+  version: 0.39.11
 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