takeltau 0.39.0 → 0.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f3cdc1423e876043ceea53b0e7209589e7b5474ad44b1213cbffa6336ad7af
-  data.tar.gz: 83a3dfa517ac84b8265a09b64b325184473fd0a22bf98fd241f4713e7e59c0ce
+  metadata.gz: efcd37beaf72d26ec96d9036cec64b14150b2b1b3685d30842aa3843ccb29b1e
+  data.tar.gz: 5018c78c0dd215eeb8a49b17c58e1230ed697957d1188fb2abdf33e906c3f219
 SHA512:
-  metadata.gz: 923b34a21ed9d509f88be302e3c4e8682adae221d60f59a6a092ba706501ed5de13125a0184e0d7d26130441aeb84c015be119ec9e5a313a4078c11bf17de7e0
-  data.tar.gz: 83eec4fbdd1c53604dce8d1d53fab8d3c94678f997611f294afd6d833dcabcf78315337e427af44234f2562d8c4006d76eb585cdd2ff09afbeef8077d44b168a
+  metadata.gz: 6052b700a56b6c15f8c1c980a97ab47f10b33b9403f3266920f8aaa232b0dcb0a5db921df9863089b5f5440a7816c120b8169ff2be7b6306aed213562fa9acb5
+  data.tar.gz: a644c2d3082c2b1a6ed8a0ace6ce05e7b2bfbf327d7b118fd8201a668644e15c3791002edcd874bb0c98f467cceb699dc87dcbf2f3af8a4fd89e9b56c643054f

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}}"'
@@ -48,11 +48,12 @@ 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'
@@ -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'],

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/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.39.0
+0.39.2

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.2
 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