takelage 0.12.2 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/takelage/default.yml +3 -3
  3. data/lib/takelage/docker/container/cli.rb +4 -1
  4. data/lib/takelage/docker/container/module.rb +2 -0
  5. data/lib/takelage/docker/socket/module.rb +2 -2
  6. data/lib/takelage/version +1 -1
  7. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b65f74497d8814e2fb3833998b0cd23ab96d7ee9279e5619b28f6b55caa9f105
4
- data.tar.gz: 6b388494217e425aa8114fd06baff7355fb3b47474415d9d900b1534168497f3
3
+ metadata.gz: 4603678be609c134b9c2ef635a8a454cf2f58c4679b1c6b765a36c0789854282
4
+ data.tar.gz: 4cf4b45fbbc6bf3472a906c915c54fd0d9dcac322824131476c1ef6684dceef1
5
5
  SHA512:
6
- metadata.gz: 3d6b9812001a32494a7efb8bdbb63e4920b781f8cfbeee04471453f826ef9ec613378fdeb188df9a5d6594fbb8be745551075e8fd70c15f065e01be09d035e1b
7
- data.tar.gz: 8b8d84b7a7675c79909dc8da34a1adddceeb60d2e4c60ad031698938126d3a993a55a0482ce2382119a92f1e3e6e2c53e79e2e0ce5d60431378230385a12ee3f
6
+ metadata.gz: ab517e5b83e65c85c0ee42a9794e4088e83d88a16402754d3d757288e4c9911917cda7e2f4e56f88a8d2013d137620a20210bdd97611ed4059d7951e6dbd96b3
7
+ data.tar.gz: '09ea31a6e6244cbf70456f12b2d5d91cd2ce028646c7e0509665ea923139bde527b34a34a89124011be743c459d183c7415949cab4fd155a4d3bc59aba67e935'
data/lib/takelage/default.yml CHANGED
@@ -27,7 +27,7 @@ cmd_docker_check_running_docker_info: 'docker info'
27
27
  cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
28
28
  cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
29
29
  cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
30
- 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}'
30
+ 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}'
31
31
  cmd_docker_container_create_network: 'docker network create %{network}'
32
32
  cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
33
33
  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'
55
55
  docker_entrypoint_options: ''
56
56
  docker_registry: 'https://registry.hub.docker.com'
57
57
  docker_repo: 'takelage'
58
- docker_socket_agent_socket_port: 20000
59
- docker_socket_agent_ssh_socket_port: 20001
58
+ docker_socket_gpg_agent_port: 17874
59
+ docker_socket_gpg_ssh_agent_port: 17875
60
60
  docker_tag: 'latest'
61
61
  docker_user: 'takelage'
62
62
  info_project_main: 'project.yml'
data/lib/takelage/docker/container/cli.rb CHANGED
@@ -28,9 +28,12 @@ module Takelage
28
28
  @docker_registry = config.active['docker_registry']
29
29
  @docker_tag = config.active['docker_tag']
30
30
 
31
+ @dockersock = '/var/run/docker.sock'
32
+
31
33
  @entrypoint_options = config.active['docker_entrypoint_options']
32
34
 
33
- @dockersock = '/var/run/docker.sock'
35
+ @gpg_agent_port = config.active['docker_socket_gpg_agent_port']
36
+ @gpg_ssh_agent_port = config.active['docker_socket_gpg_ssh_agent_port']
34
37
 
35
38
  @username = ENV['USER'] ? ENV['USER'] : 'username'
36
39
  @gid = Etc.getpwnam(@username).gid
data/lib/takelage/docker/container/module.rb CHANGED
@@ -146,6 +146,8 @@ module DockerContainerModule
146
146
  gid: @gid,
147
147
  uid: @uid,
148
148
  username: @username,
149
+ gpg_agent_port: @gpg_agent_port,
150
+ gpg_ssh_agent_port: @gpg_ssh_agent_port,
149
151
  entrypoint_options: @entrypoint_options
150
152
  }
151
153
 
data/lib/takelage/docker/socket/module.rb CHANGED
@@ -12,7 +12,7 @@ module DockerSocketModule
12
12
  agent_socket_path.chomp!
13
13
 
14
14
  agent_socket_port =
15
- config.active['docker_socket_agent_socket_port']
15
+ config.active['docker_socket_gpg_agent_port']
16
16
 
17
17
  cmd_agent_ssh_socket_path =
18
18
  config.active['cmd_docker_socket_config_agent_ssh_socket_path']
@@ -21,7 +21,7 @@ module DockerSocketModule
21
21
  agent_ssh_socket_path.chomp!
22
22
 
23
23
  agent_ssh_socket_port =
24
- config.active['docker_socket_agent_ssh_socket_port']
24
+ config.active['docker_socket_gpg_ssh_agent_port']
25
25
 
26
26
  socket_scheme = {
27
27
  'agent-socket' => {
data/lib/takelage/version CHANGED
@@ -1 +1 @@
1
- 0.12.2
1
+ 0.13.0
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: takelage
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.2
4
+ version: 0.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Geospin