takeltau 0.45.12 → 0.45.14
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/takeltau/default.yml +1 -2
- data/lib/takeltau/ship/container/stop.rb +1 -1
- data/lib/takeltau/ship/project/cli.rb +0 -7
- data/lib/takeltau/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: 3c88546f57b7641ceeb01f2aca88a18ec553343c5ff822406fdc88105965274c
|
|
4
|
+
data.tar.gz: 5430e736adc4fb7055deff87733c78be352c74cdb3e2d96511119603c1f5dbbe
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e22aa5ce53cc93437c91edc3066280d29e6a1de3075266c208cf6bcb02ef97832e482ed22af5a3eff5a834b477bfd9b63141ada90e87300071cef3743966de3f
|
|
7
|
+
data.tar.gz: df592a803fbec57a22b6f037311a19134a1775f3a1c2b71d955e2f41181d5ab13357ca4cb2d9a985ac865a5869a39a505d118d11d704f3e9e4df9fe309e1b6b9
|
data/lib/takeltau/default.yml
CHANGED
|
@@ -62,9 +62,9 @@ cmd_ship_container_login: 'bash'
|
|
|
62
62
|
cmd_ship_container_logs: '%{ship_docker} logs %{ship_hostname} %{args}'
|
|
63
63
|
cmd_ship_docker: 'docker'
|
|
64
64
|
cmd_ship_docker_check: 'docker --version'
|
|
65
|
+
cmd_ship_docker_stop: '%{ship_docker} kill %{ship_hostname}'
|
|
65
66
|
cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{ship_run_args_nonprivileged} %{image} %{command}'
|
|
66
67
|
cmd_ship_project_start_docker_run_privileged: '%{ship_docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume %{project_root_dir}/%{ship_data_dir}:/home/podman/takelship %{ship_run_args_privileged} %{image} %{command}'
|
|
67
|
-
cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
|
|
68
68
|
docker_container_check_matrjoschka: true
|
|
69
69
|
docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
|
|
70
70
|
docker_entrypoint_extra: ''
|
|
@@ -98,7 +98,6 @@ ship_images_sync: true
|
|
|
98
98
|
ship_name: 'takelship'
|
|
99
99
|
ship_podman_localhost: '127.0.0.1'
|
|
100
100
|
ship_repo: 'takelship'
|
|
101
|
-
ship_restart_sleep_seconds: '2'
|
|
102
101
|
ship_run_args_nonprivileged: ''
|
|
103
102
|
ship_run_args_privileged: ''
|
|
104
103
|
ship_tag: 'latest'
|
|
@@ -15,7 +15,7 @@ module ShipContainerStop
|
|
|
15
15
|
return false unless ship_container_check_existing
|
|
16
16
|
|
|
17
17
|
cmd_docker_stop_command = format(
|
|
18
|
-
config.active['
|
|
18
|
+
config.active['cmd_ship_docker_stop'],
|
|
19
19
|
ship_docker: config.active['cmd_ship_docker'],
|
|
20
20
|
ship_hostname: _ship_container_lib_ship_hostname
|
|
21
21
|
)
|
|
@@ -52,13 +52,6 @@ module Takeltau
|
|
|
52
52
|
# ship restart: {Takeltau::ShipProject#restart}
|
|
53
53
|
def restart(project = 'default')
|
|
54
54
|
Takeltau::ShipProject.new.stop
|
|
55
|
-
begin
|
|
56
|
-
seconds = Integer(config.active['ship_restart_sleep_seconds'])
|
|
57
|
-
rescue ArgumentError
|
|
58
|
-
seconds = 2
|
|
59
|
-
end
|
|
60
|
-
log.debug "Sleeping for #{seconds} seconds"
|
|
61
|
-
sleep seconds
|
|
62
55
|
Takeltau::ShipProject.new.start project
|
|
63
56
|
end
|
|
64
57
|
|
data/lib/takeltau/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.45.
|
|
1
|
+
0.45.14
|