takelage 0.14.3 → 0.14.4
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 +2 -1
- data/lib/takelage/docker/container/lib.rb +14 -11
- 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: b11280b2d7f965033c6b22b5436a1b4e8ccd8e508be60ca053985e8262e2df5b
|
|
4
|
+
data.tar.gz: 1f481e242561c2cace4fdf2be758fd56b32992f0a228d4657c59ff0c9e12a2a4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f17d0841d4d592e81e9dce280ddf61a7a3a4ad40f1e8bc0d8e7f64ff23588606926f93b66f8993a61ac728c41d1bec2754588db75a6544defdb6ca43c6a4eb74
|
|
7
|
+
data.tar.gz: 2192bbc3b2cf3bd4fe11c6e9b7e348ae7d408114265beae0443cb3acb0ba90d6b45e3f19a789a928b778956de40ed337c742ed2f71da69f9c90033a26a5a12ac
|
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 --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
|
+
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} %{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}'
|
|
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}}"'
|
|
@@ -58,6 +58,7 @@ docker_entrypoint_options: ''
|
|
|
58
58
|
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
|
+
docker_shm_size: '512M'
|
|
61
62
|
docker_socket_gpg_agent_port: 17874
|
|
62
63
|
docker_socket_gpg_ssh_agent_port: 17875
|
|
63
64
|
docker_tag: 'latest'
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# takelage docker container lib
|
|
4
|
+
# rubocop:disable Metrics/ModuleLength
|
|
4
5
|
module DockerContainerLib
|
|
5
6
|
private
|
|
6
7
|
|
|
@@ -74,23 +75,24 @@ module DockerContainerLib
|
|
|
74
75
|
|
|
75
76
|
cmd_docker_create = format(
|
|
76
77
|
config.active['cmd_docker_container_create'],
|
|
77
|
-
workdir: @workdir,
|
|
78
|
-
timezone: 'Europe/Berlin',
|
|
79
|
-
container: container,
|
|
80
|
-
dockersock: '/var/run/docker.sock',
|
|
81
|
-
homedir: ENV['HOME'] || '/tmp',
|
|
82
|
-
volume_dev: volume_dev,
|
|
83
|
-
image: image,
|
|
84
78
|
addhost: addhost,
|
|
79
|
+
container: container,
|
|
85
80
|
dockerrun_options: config.active['docker_run_options'],
|
|
81
|
+
dockersock: '/var/run/docker.sock',
|
|
86
82
|
entrypoint: entrypoint,
|
|
87
|
-
|
|
83
|
+
entrypoint_options: config.active['docker_entrypoint_options'],
|
|
84
|
+
extra: config.active['docker_entrypoint_extra'],
|
|
88
85
|
gid: Etc.getpwnam(@username).gid,
|
|
89
|
-
username: @username,
|
|
90
86
|
gpg_agent_port: config.active['docker_socket_gpg_agent_port'],
|
|
91
87
|
gpg_ssh_agent_port: config.active['docker_socket_gpg_ssh_agent_port'],
|
|
92
|
-
|
|
93
|
-
|
|
88
|
+
homedir: ENV['HOME'] || '/tmp',
|
|
89
|
+
image: image,
|
|
90
|
+
shmsize: config.active['docker_shm_size'],
|
|
91
|
+
timezone: 'Europe/Berlin',
|
|
92
|
+
uid: Etc.getpwnam(@username).uid,
|
|
93
|
+
username: @username,
|
|
94
|
+
volume_dev: volume_dev,
|
|
95
|
+
workdir: @workdir
|
|
94
96
|
)
|
|
95
97
|
|
|
96
98
|
try cmd_docker_create
|
|
@@ -149,3 +151,4 @@ module DockerContainerLib
|
|
|
149
151
|
run cmd_docker_stop
|
|
150
152
|
end
|
|
151
153
|
end
|
|
154
|
+
# rubocop:enable Metrics/ModuleLength
|
data/lib/takelage/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.14.
|
|
1
|
+
0.14.4
|