takelage 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb68cec0dee7158fd9430364abf37d0812091cbbabdb260da39cd297f895f49
-  data.tar.gz: b878992c6e960353b53fdb47fc1ed8ad91887b027190a4c17ebafe5d3263563c
+  metadata.gz: c9f51ce427b8a3bd4c6939cc75b79caff5408604745851a9fefd1d4a8dab3512
+  data.tar.gz: 86cd99aead208edb2b10c2754cacc179583672d5a936fe37e7e071f2ebccf6c8
 SHA512:
-  metadata.gz: f9f6663cc8336b1bb3a23c5ffe292cae4b387f11f5660ef1476bce85cc84358faebbfa95efa099c1a59e39ead98b549fd3c7bbe1a6eadd59fec1ea04d3ef9e1f
-  data.tar.gz: 6cdc9904b8c94050f26b8d2ecfa638f9804eb69fef26f6d384b11a92f33bcf8180ffe4e0e308bc3b8fbde7547600617bcee2597cb48fb6e3c3b1317adfa338e9
+  metadata.gz: b3861bb762966a410dd3014891b6b3ebe606f0cb2180be8d8b7c7cb180f5b0df05b1265882e655a7a6ae85c80714eec62d96c2a9ce26b52d598f4b91d0ddfaa4
+  data.tar.gz: 5ff862c254d0a49e2e7670f048c26d5e5c925d9df24f09ebbb45bcd6cb0f804719787f2ed1c460c324637e7e58c42ad32b91d28ff7247589e00cd5263aefe7c0

data/lib/takelage/default.yml

@@ -28,7 +28,7 @@ cmd_docker_check_running_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} --privileged --rm --shm-size %{shmsize} --tty --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --docker_daemon_port %{docker_daemon_port} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --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} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --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}}"'
@@ -44,7 +44,7 @@ cmd_docker_socket_config_agent_socket_path: 'gpgconf --list-dirs agent-socket'
 cmd_docker_socket_config_agent_ssh_socket_path: 'gpgconf --list-dirs agent-ssh-socket'
 cmd_docker_socket_get_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
 cmd_docker_socket_start_sudo_true: 'sudo true'
-cmd_docker_socket_stop_docker_socket_ps: 'sudo ps ax -o pid,command'
+cmd_docker_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
 cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
@@ -59,7 +59,6 @@ docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
 docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/default.json'
 docker_shm_size: '512M'
-docker_socket_docker_daemon_port: 17873
 docker_socket_gpg_agent_port: 17874
 docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'

data/lib/takelage/docker/container/lib.rb

@@ -2,11 +2,11 @@
 
 # takelage docker container lib
 # rubocop:disable Metrics/ModuleLength
+# rubocop:disable Style/IfUnlessModifier
 module DockerContainerLib
   private
 
   # Create docker container and network.
-  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_create_net_and_ctr(name)
     unless docker_container_check_network name
       _docker_container_lib_create_network name
@@ -16,10 +16,8 @@ module DockerContainerLib
 
     _docker_container_lib_create_container name
   end
-  # rubocop:enable Style/IfUnlessModifier
 
   # Remove docker networks.
-  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_remove_networks(networks)
     networks.each do |network|
       if docker_container_check_network network
@@ -27,7 +25,6 @@ module DockerContainerLib
       end
     end
   end
-  # rubocop:enable Style/IfUnlessModifier
 
   # Create docker network.
   def _docker_container_lib_create_network(network)
@@ -56,7 +53,6 @@ module DockerContainerLib
   # Create docker container.
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
-  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_create_container(container)
     log.debug "Creating container \"#{container}\""
 
@@ -83,7 +79,7 @@ module DockerContainerLib
       addhost: addhost,
       container: container,
       docker_run_options: config.active['docker_run_options'],
-      docker_daemon_port: config.active['docker_socket_docker_daemon_port'],
+      dockersock: '/var/run/docker.sock',
       entrypoint: entrypoint,
       entrypoint_options: config.active['docker_entrypoint_options'],
       extra: config.active['docker_entrypoint_extra'],
@@ -102,7 +98,6 @@ module DockerContainerLib
 
     try cmd_docker_create
   end
-  # rubocop:enable Style/IfUnlessModifier
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
@@ -157,4 +152,5 @@ module DockerContainerLib
     run cmd_docker_stop
   end
 end
+# rubocop:enable Style/IfUnlessModifier
 # rubocop:enable Metrics/ModuleLength

data/lib/takelage/docker/socket/scheme.rb

@@ -6,34 +6,20 @@ module DockerSocketScheme
   def docker_socket_scheme
     log.debug 'Getting docker socket scheme'
 
-    socket_scheme = _socket_get_scheme _socket_get_config
+    gpg_path = _socket_get_agent_socket_path
+    gpg_port = config.active['docker_socket_gpg_agent_port']
+    ssh_path = _socket_get_agent_ssh_socket_path
+    ssh_port = config.active['docker_socket_gpg_ssh_agent_port']
 
-    log.debug "Docker socket scheme is \n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
+    socket_scheme = _socket_get_scheme gpg_path, gpg_port, ssh_path, ssh_port
+    log.debug 'Docker socket scheme is ' \
+      "\n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
 
     socket_scheme
   end
 
   private
 
-  # Get docker socket config.
-  def _socket_get_config
-    socket_config = {
-      'docker_path' => _socket_get_docker_daemon_path,
-      'docker_port' => config.active['docker_socket_docker_daemon_port'],
-      'gpg_path' => _socket_get_agent_socket_path,
-      'gpg_port' => config.active['docker_socket_gpg_agent_port'],
-      'ssh_path' => _socket_get_agent_ssh_socket_path,
-      'ssh_port' => config.active['docker_socket_gpg_ssh_agent_port']
-    }
-
-    socket_config
-  end
-
-  # Get docker socket path.
-  def _socket_get_docker_daemon_path
-    '/var/run/docker.sock'
-  end
-
   # Get gpg agent socket path.
   def _socket_get_agent_socket_path
     cmd_agent_socket_path =
@@ -49,15 +35,12 @@ module DockerSocketScheme
   end
 
   # Create socket scheme.
-  def _socket_get_scheme(socket_config)
-    { 'docker-daemon' => { 'path' => socket_config['docker_path'],
-                           'host' => @socket_host,
-                           'port' => socket_config['docker_port'] },
-      'gpg-agent' => { 'path' => socket_config['gpg_path'],
-                       'host' => @socket_host,
-                       'port' => socket_config['gpg_port'] },
-      'gpg-ssh-agent' => { 'path' => socket_config['ssh_path'],
-                           'host' => @socket_host,
-                           'port' => socket_config['ssh_port'] } }
+  def _socket_get_scheme(gpg_path, gpg_port, ssh_path, ssh_port)
+    { 'agent-socket' => { 'path' => gpg_path,
+                          'host' => @socket_host,
+                          'port' => gpg_port },
+      'agent-ssh-socket' => { 'path' => ssh_path,
+                              'host' => @socket_host,
+                              'port' => ssh_port } }
   end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.18.1
+0.19.0

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Geospin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-12-08 00:00:00.000000000 Z
@@ -276,7 +276,7 @@ licenses:
 - GPL-3.0
 metadata:
   yard.run: yard
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -291,8 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: takelage devops workflow cli
 test_files: []