takelage 0.17.1 → 0.18.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/takelage/default.yml +2 -1
- data/lib/takelage/docker/container/lib.rb +1 -1
- data/lib/takelage/docker/socket/scheme.rb +31 -14
- 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: c8af5bb8cdf3144a82eb3b8e1058e51b6f05cb631d04bfba15db6f7a8d07c5c8
|
|
4
|
+
data.tar.gz: 3db0b716115de02773ece1d5cb3ecc0fd6c4a79fe1d5a0ba46d6cc3dc0cd27cc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a6a7a3c1403ad667863df7e88880ea5bea8c43b093330cc5b10530d673c3bd4a92040ae4da7c96d78c9eea708b66b8a77593103d8d2c5e4521e2862c10c3477d
|
|
7
|
+
data.tar.gz: 9e8a39e3064d832ec9423b8acd23349e99b06071f171d4726845677baf937cdb541a61237507b6c2a65d0f3a077b8aed23d343cf121080884ca9b15669a975c8
|
data/lib/takelage/default.yml
CHANGED
|
@@ -28,7 +28,7 @@ cmd_docker_check_running_docker_info: 'docker info'
|
|
|
28
28
|
cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
|
|
29
29
|
cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
|
|
30
30
|
cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
|
|
31
|
-
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 %{
|
|
31
|
+
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}'
|
|
32
32
|
cmd_docker_container_create_network: 'docker network create %{network}'
|
|
33
33
|
cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
|
|
34
34
|
cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
|
|
@@ -59,6 +59,7 @@ docker_registry: 'https://registry.hub.docker.com'
|
|
|
59
59
|
docker_repo: 'takelage'
|
|
60
60
|
docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/default.json'
|
|
61
61
|
docker_shm_size: '512M'
|
|
62
|
+
docker_socket_docker_daemon_port: 17873
|
|
62
63
|
docker_socket_gpg_agent_port: 17874
|
|
63
64
|
docker_socket_gpg_ssh_agent_port: 17875
|
|
64
65
|
docker_tag: 'latest'
|
|
@@ -83,7 +83,7 @@ module DockerContainerLib
|
|
|
83
83
|
addhost: addhost,
|
|
84
84
|
container: container,
|
|
85
85
|
docker_run_options: config.active['docker_run_options'],
|
|
86
|
-
|
|
86
|
+
docker_daemon_port: config.active['docker_socket_docker_daemon_port'],
|
|
87
87
|
entrypoint: entrypoint,
|
|
88
88
|
entrypoint_options: config.active['docker_entrypoint_options'],
|
|
89
89
|
extra: config.active['docker_entrypoint_extra'],
|
|
@@ -6,20 +6,34 @@ module DockerSocketScheme
|
|
|
6
6
|
def docker_socket_scheme
|
|
7
7
|
log.debug 'Getting docker socket scheme'
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
gpg_port = config.active['docker_socket_gpg_agent_port']
|
|
11
|
-
ssh_path = _socket_get_agent_ssh_socket_path
|
|
12
|
-
ssh_port = config.active['docker_socket_gpg_ssh_agent_port']
|
|
9
|
+
socket_scheme = _socket_get_scheme _socket_get_config
|
|
13
10
|
|
|
14
|
-
|
|
15
|
-
log.debug 'Docker socket scheme is ' \
|
|
16
|
-
"\n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
|
|
11
|
+
log.debug "Docker socket scheme is \n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
|
|
17
12
|
|
|
18
13
|
socket_scheme
|
|
19
14
|
end
|
|
20
15
|
|
|
21
16
|
private
|
|
22
17
|
|
|
18
|
+
# Get docker socket config.
|
|
19
|
+
def _socket_get_config
|
|
20
|
+
socket_config = {
|
|
21
|
+
'docker_path' => _socket_get_docker_daemon_path,
|
|
22
|
+
'docker_port' => config.active['docker_socket_docker_daemon_port'],
|
|
23
|
+
'gpg_path' => _socket_get_agent_socket_path,
|
|
24
|
+
'gpg_port' => config.active['docker_socket_gpg_agent_port'],
|
|
25
|
+
'ssh_path' => _socket_get_agent_ssh_socket_path,
|
|
26
|
+
'ssh_port' => config.active['docker_socket_gpg_ssh_agent_port']
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
socket_config
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
# Get docker socket path.
|
|
33
|
+
def _socket_get_docker_daemon_path
|
|
34
|
+
'/var/run/docker.sock'
|
|
35
|
+
end
|
|
36
|
+
|
|
23
37
|
# Get gpg agent socket path.
|
|
24
38
|
def _socket_get_agent_socket_path
|
|
25
39
|
cmd_agent_socket_path =
|
|
@@ -35,12 +49,15 @@ module DockerSocketScheme
|
|
|
35
49
|
end
|
|
36
50
|
|
|
37
51
|
# Create socket scheme.
|
|
38
|
-
def _socket_get_scheme(
|
|
39
|
-
{ '
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
'agent
|
|
43
|
-
|
|
44
|
-
|
|
52
|
+
def _socket_get_scheme(socket_config)
|
|
53
|
+
{ 'docker-daemon' => { 'path' => socket_config['docker_path'],
|
|
54
|
+
'host' => @socket_host,
|
|
55
|
+
'port' => socket_config['docker_port'] },
|
|
56
|
+
'gpg-agent' => { 'path' => socket_config['gpg_path'],
|
|
57
|
+
'host' => @socket_host,
|
|
58
|
+
'port' => socket_config['gpg_port'] },
|
|
59
|
+
'gpg-ssh-agent' => { 'path' => socket_config['ssh_path'],
|
|
60
|
+
'host' => @socket_host,
|
|
61
|
+
'port' => socket_config['ssh_port'] } }
|
|
45
62
|
end
|
|
46
63
|
end
|
data/lib/takelage/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.18.0
|