takelage 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65f74497d8814e2fb3833998b0cd23ab96d7ee9279e5619b28f6b55caa9f105
-  data.tar.gz: 6b388494217e425aa8114fd06baff7355fb3b47474415d9d900b1534168497f3
+  metadata.gz: 4603678be609c134b9c2ef635a8a454cf2f58c4679b1c6b765a36c0789854282
+  data.tar.gz: 4cf4b45fbbc6bf3472a906c915c54fd0d9dcac322824131476c1ef6684dceef1
 SHA512:
-  metadata.gz: 3d6b9812001a32494a7efb8bdbb63e4920b781f8cfbeee04471453f826ef9ec613378fdeb188df9a5d6594fbb8be745551075e8fd70c15f065e01be09d035e1b
-  data.tar.gz: 8b8d84b7a7675c79909dc8da34a1adddceeb60d2e4c60ad031698938126d3a993a55a0482ce2382119a92f1e3e6e2c53e79e2e0ce5d60431378230385a12ee3f
+  metadata.gz: ab517e5b83e65c85c0ee42a9794e4088e83d88a16402754d3d757288e4c9911917cda7e2f4e56f88a8d2013d137620a20210bdd97611ed4059d7951e6dbd96b3
+  data.tar.gz: '09ea31a6e6244cbf70456f12b2d5d91cd2ce028646c7e0509665ea923139bde527b34a34a89124011be743c459d183c7415949cab4fd155a4d3bc59aba67e935'

data/lib/takelage/default.yml

@@ -27,7 +27,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 %{addhost} --detach --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run %{addhost} --detach --env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} %{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}}"'
@@ -55,8 +55,8 @@ docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
 docker_entrypoint_options: ''
 docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
-docker_socket_agent_socket_port: 20000
-docker_socket_agent_ssh_socket_port: 20001
+docker_socket_gpg_agent_port: 17874
+docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'
 docker_user: 'takelage'
 info_project_main: 'project.yml'

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

@@ -28,9 +28,12 @@ module Takelage
       @docker_registry = config.active['docker_registry']
       @docker_tag = config.active['docker_tag']
 
+      @dockersock = '/var/run/docker.sock'
+
       @entrypoint_options = config.active['docker_entrypoint_options']
 
-      @dockersock = '/var/run/docker.sock'
+      @gpg_agent_port = config.active['docker_socket_gpg_agent_port']
+      @gpg_ssh_agent_port = config.active['docker_socket_gpg_ssh_agent_port']
 
       @username = ENV['USER'] ? ENV['USER'] : 'username'
       @gid = Etc.getpwnam(@username).gid

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

@@ -146,6 +146,8 @@ module DockerContainerModule
             gid: @gid,
             uid: @uid,
             username: @username,
+            gpg_agent_port: @gpg_agent_port,
+            gpg_ssh_agent_port: @gpg_ssh_agent_port,
             entrypoint_options: @entrypoint_options
         }
 

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

@@ -12,7 +12,7 @@ module DockerSocketModule
     agent_socket_path.chomp!
 
     agent_socket_port =
-        config.active['docker_socket_agent_socket_port']
+        config.active['docker_socket_gpg_agent_port']
 
     cmd_agent_ssh_socket_path =
         config.active['cmd_docker_socket_config_agent_ssh_socket_path']
@@ -21,7 +21,7 @@ module DockerSocketModule
     agent_ssh_socket_path.chomp!
 
     agent_ssh_socket_port =
-        config.active['docker_socket_agent_ssh_socket_port']
+        config.active['docker_socket_gpg_ssh_agent_port']
 
     socket_scheme = {
         'agent-socket' => {

data/lib/takelage/version

@@ -1 +1 @@
-0.12.2
+0.13.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Geospin