takelage 0.17.0 → 0.17.1
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 +1 -1
- data/lib/takelage/docker/container/cli.rb +12 -12
- data/lib/takelage/docker/container/lib.rb +7 -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: cc2254d636048ddf28ea83ce7862973ec8c04fb47dd445d7e98543d11c0b0d9f
|
4
|
+
data.tar.gz: 4d5d1d664d8984321e3c7c9199a22e390ac2674b931f86d2a054c95da003ecee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fd2a2b107c85b35b49f4fe3e8b3b53dc93d4209e20ffda644fbab530a60374d5d43634b2032f07dbfecf1e89eabe05b92a5e7b5af1f09c5a93e7ea3d09d32181
|
7
|
+
data.tar.gz: 6adda557b7f192298dd2512de7bf470dcb5ac4dbf8ae37cbf9e7a8c0ed1af20d5452b90ce1a0ae1cb0ad6f54d70230b114e16721e9fb8e8ba2f2c31d88978c60
|
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 %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{
|
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} %{docker_run_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}}"'
|
@@ -46,6 +46,18 @@ module Takelage
|
|
46
46
|
desc 'check [COMMAND]', 'Check docker container'
|
47
47
|
subcommand 'check', DockerContainerCheck
|
48
48
|
|
49
|
+
#
|
50
|
+
# docker container clean
|
51
|
+
#
|
52
|
+
desc 'clean', 'Remove all docker containers'
|
53
|
+
long_desc <<-LONGDESC.gsub("\n", "\x5")
|
54
|
+
Remove all docker containers
|
55
|
+
LONGDESC
|
56
|
+
# Remove all docker containers.
|
57
|
+
def clean
|
58
|
+
docker_container_clean
|
59
|
+
end
|
60
|
+
|
49
61
|
#
|
50
62
|
# docker container command
|
51
63
|
#
|
@@ -87,18 +99,6 @@ module Takelage
|
|
87
99
|
docker_container_login
|
88
100
|
end
|
89
101
|
|
90
|
-
#
|
91
|
-
# docker container clean
|
92
|
-
#
|
93
|
-
desc 'clean', 'Remove all docker containers'
|
94
|
-
long_desc <<-LONGDESC.gsub("\n", "\x5")
|
95
|
-
Remove all docker containers
|
96
|
-
LONGDESC
|
97
|
-
# Remove all docker containers.
|
98
|
-
def clean
|
99
|
-
docker_container_clean
|
100
|
-
end
|
101
|
-
|
102
102
|
#
|
103
103
|
# docker container prune
|
104
104
|
#
|
@@ -6,6 +6,7 @@ module DockerContainerLib
|
|
6
6
|
private
|
7
7
|
|
8
8
|
# Create docker container and network.
|
9
|
+
# rubocop:disable Style/IfUnlessModifier
|
9
10
|
def _docker_container_lib_create_net_and_ctr(name)
|
10
11
|
unless docker_container_check_network name
|
11
12
|
_docker_container_lib_create_network name
|
@@ -15,8 +16,10 @@ module DockerContainerLib
|
|
15
16
|
|
16
17
|
_docker_container_lib_create_container name
|
17
18
|
end
|
19
|
+
# rubocop:enable Style/IfUnlessModifier
|
18
20
|
|
19
21
|
# Remove docker networks.
|
22
|
+
# rubocop:disable Style/IfUnlessModifier
|
20
23
|
def _docker_container_lib_remove_networks(networks)
|
21
24
|
networks.each do |network|
|
22
25
|
if docker_container_check_network network
|
@@ -24,6 +27,7 @@ module DockerContainerLib
|
|
24
27
|
end
|
25
28
|
end
|
26
29
|
end
|
30
|
+
# rubocop:enable Style/IfUnlessModifier
|
27
31
|
|
28
32
|
# Create docker network.
|
29
33
|
def _docker_container_lib_create_network(network)
|
@@ -52,6 +56,7 @@ module DockerContainerLib
|
|
52
56
|
# Create docker container.
|
53
57
|
# rubocop:disable Metrics/MethodLength
|
54
58
|
# rubocop:disable Metrics/AbcSize
|
59
|
+
# rubocop:disable Style/IfUnlessModifier
|
55
60
|
def _docker_container_lib_create_container(container)
|
56
61
|
log.debug "Creating container \"#{container}\""
|
57
62
|
|
@@ -77,7 +82,7 @@ module DockerContainerLib
|
|
77
82
|
config.active['cmd_docker_container_create'],
|
78
83
|
addhost: addhost,
|
79
84
|
container: container,
|
80
|
-
|
85
|
+
docker_run_options: config.active['docker_run_options'],
|
81
86
|
dockersock: '/var/run/docker.sock',
|
82
87
|
entrypoint: entrypoint,
|
83
88
|
entrypoint_options: config.active['docker_entrypoint_options'],
|
@@ -97,6 +102,7 @@ module DockerContainerLib
|
|
97
102
|
|
98
103
|
try cmd_docker_create
|
99
104
|
end
|
105
|
+
# rubocop:enable Style/IfUnlessModifier
|
100
106
|
# rubocop:enable Metrics/AbcSize
|
101
107
|
# rubocop:enable Metrics/MethodLength
|
102
108
|
|
data/lib/takelage/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.17.
|
1
|
+
0.17.1
|