takelage 0.13.0 → 0.13.1
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.
- checksums.yaml +4 -4
- data/lib/takelage/default.yml +3 -1
- data/lib/takelage/docker/container/cli.rb +3 -0
- data/lib/takelage/docker/container/module.rb +3 -1
- data/lib/takelage/version +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 63e3f97142ec8fbf49c1b753986ca84d80a5e9fc8069d9168b0f927bc22a3e2d
|
|
4
|
+
data.tar.gz: 41ee3b0215e955d565a10293d3fecd8c14aaf704f6403c5757051cd10c79d06a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5d4c7d1c8041ea86afb80d64c1db124ebae6c5d067afef21d8d9ed9f4a2c42176047df7014c152cd3123b1c28570d59ccd2d371180ef5683513422081305a7c9
|
|
7
|
+
data.tar.gz: f6abded50f6115a53c9da2e16bfd5a59e3450fa99e9ae57538011d69fa4bd9284b1454e2783bd2f923a22a4de087ffc0220dd3951099d0125a61aa41594ddac5
|
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
|
|
30
|
+
cmd_docker_container_create: 'docker run --detach --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 %{addhost} %{dockerrun_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}'
|
|
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}}"'
|
|
@@ -52,9 +52,11 @@ cmd_git_check_master_git_branch: 'git symbolic-ref HEAD'
|
|
|
52
52
|
cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
|
|
53
53
|
cmd_git_check_workspace_pwd: 'pwd'
|
|
54
54
|
docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
|
|
55
|
+
docker_entrypoint_extra: '.config/gcloud'
|
|
55
56
|
docker_entrypoint_options: ''
|
|
56
57
|
docker_registry: 'https://registry.hub.docker.com'
|
|
57
58
|
docker_repo: 'takelage'
|
|
59
|
+
docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/default.json'
|
|
58
60
|
docker_socket_gpg_agent_port: 17874
|
|
59
61
|
docker_socket_gpg_ssh_agent_port: 17875
|
|
60
62
|
docker_tag: 'latest'
|
|
@@ -30,6 +30,9 @@ module Takelage
|
|
|
30
30
|
|
|
31
31
|
@dockersock = '/var/run/docker.sock'
|
|
32
32
|
|
|
33
|
+
@dockerrun_options = config.active['docker_run_options']
|
|
34
|
+
|
|
35
|
+
@entrypoint_extra = config.active['docker_entrypoint_extra']
|
|
33
36
|
@entrypoint_options = config.active['docker_entrypoint_options']
|
|
34
37
|
|
|
35
38
|
@gpg_agent_port = config.active['docker_socket_gpg_agent_port']
|
|
@@ -134,7 +134,6 @@ module DockerContainerModule
|
|
|
134
134
|
|
|
135
135
|
cmd_docker_create =
|
|
136
136
|
config.active['cmd_docker_container_create'] % {
|
|
137
|
-
addhost: addhost,
|
|
138
137
|
workdir: @workdir,
|
|
139
138
|
timezone: @timezone,
|
|
140
139
|
container: container,
|
|
@@ -142,12 +141,15 @@ module DockerContainerModule
|
|
|
142
141
|
homedir: @homedir,
|
|
143
142
|
volume_dev: volume_dev,
|
|
144
143
|
image: image,
|
|
144
|
+
addhost: addhost,
|
|
145
|
+
dockerrun_options: @dockerrun_options,
|
|
145
146
|
entrypoint: entrypoint,
|
|
146
147
|
gid: @gid,
|
|
147
148
|
uid: @uid,
|
|
148
149
|
username: @username,
|
|
149
150
|
gpg_agent_port: @gpg_agent_port,
|
|
150
151
|
gpg_ssh_agent_port: @gpg_ssh_agent_port,
|
|
152
|
+
extra: @entrypoint_extra,
|
|
151
153
|
entrypoint_options: @entrypoint_options
|
|
152
154
|
}
|
|
153
155
|
|
data/lib/takelage/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.13.
|
|
1
|
+
0.13.1
|