takeltau 0.45.8 → 0.45.10
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 +4 -3
- data/lib/takeltau/ship/container/lib.rb +2 -0
- data/lib/takeltau/ship/project/start.rb +14 -4
- 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: 3cc9402c72ae878c5a390d65bcd332c9c4a610c7812f14d1b69faa60567f4878
|
4
|
+
data.tar.gz: 5b63c7e948812fda3f954c9dcddd6a6d3b08c8f9bdd919dc28cb73d7c4833c65
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9048edb463c27df323ad284d7a0cdc191f0273be70409f819eeb6e53f0a17a971a3c48454cbbe167d2e838b1caded432ed264f1390f5d10a632df9017dc0c3a1
|
7
|
+
data.tar.gz: 07ff3edf1b39b1f313e6047a252df93eeb7bc7a6f39bc0f144bc78bf824cf8daf42d51cdb6ddc96c1933fc4dc6a7d844009a01e5cb14981aff3215bf73c7e9a6
|
data/lib/takeltau/default.yml
CHANGED
@@ -65,7 +65,7 @@ cmd_ship_docker_check: 'docker --version'
|
|
65
65
|
cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{ship_run_args_nonprivileged} %{image} %{command}'
|
66
66
|
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
67
|
cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
|
68
|
-
docker_container_check_matrjoschka:
|
68
|
+
docker_container_check_matrjoschka: true
|
69
69
|
docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
|
70
70
|
docker_entrypoint_extra: ''
|
71
71
|
docker_entrypoint_options: ''
|
@@ -87,13 +87,14 @@ mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
|
|
87
87
|
mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'
|
88
88
|
mutagen_socket_path_ssh_host: '~/.gnupg/S.gpg-agent.ssh'
|
89
89
|
mutagen_socket_takelage_label: 'type=takelage'
|
90
|
-
ship_container_check_matrjoschka:
|
90
|
+
ship_container_check_matrjoschka: true
|
91
91
|
ship_data_dir: 'takelship'
|
92
92
|
ship_default_docker_host: '32375'
|
93
93
|
ship_default_project: 'default'
|
94
94
|
ship_docker_host: '32375'
|
95
95
|
ship_env: ''
|
96
96
|
ship_hostname: '%{ship_name}_%{unique}'
|
97
|
+
ship_images_sync: true
|
97
98
|
ship_name: 'takelship'
|
98
99
|
ship_podman_localhost: '127.0.0.1'
|
99
100
|
ship_repo: 'takelship'
|
@@ -102,5 +103,5 @@ ship_run_args_nonprivileged: ''
|
|
102
103
|
ship_run_args_privileged: ''
|
103
104
|
ship_tag: 'latest'
|
104
105
|
ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/takelship.yml'
|
105
|
-
ship_update:
|
106
|
+
ship_update: true
|
106
107
|
ship_user: 'takelwerk'
|
@@ -60,6 +60,8 @@ module ShipContainerLib
|
|
60
60
|
args = "#{args} #{config_args}" if config_args
|
61
61
|
args_debug = '--env TAKELSHIP_DEBUG=true'
|
62
62
|
args = "#{args} #{args_debug}" if log.level == Logger::DEBUG
|
63
|
+
args_sync = '--env TAKELSHIP_IMAGES_SYNC=false'
|
64
|
+
args = "#{args} #{args_sync}" unless config.active['ship_images_sync']
|
63
65
|
args
|
64
66
|
end
|
65
67
|
|
@@ -41,7 +41,7 @@ module ShipProjectStart
|
|
41
41
|
return false unless ship_container_check_existing
|
42
42
|
|
43
43
|
_ship_project_start_print_banner project
|
44
|
-
say '
|
44
|
+
say 'is already sailing'
|
45
45
|
say
|
46
46
|
_ship_project_start_print_ports ports
|
47
47
|
true
|
@@ -76,8 +76,15 @@ module ShipProjectStart
|
|
76
76
|
|
77
77
|
# print ports after starting a takelship
|
78
78
|
def _ship_project_start_print_ports(ports)
|
79
|
-
output = []
|
80
79
|
max_length = _ship_project_start_get_maxlength ports
|
80
|
+
ports_list = _ship_project_start_get_ports_list ports, max_length
|
81
|
+
ports_list.sort_by! { |port| port[:port] }
|
82
|
+
say ports_list.map { |port| port[:string] }.join("\n")
|
83
|
+
end
|
84
|
+
|
85
|
+
# get a sortable list of port numbers and strings describing the ports
|
86
|
+
def _ship_project_start_get_ports_list(ports, max_length)
|
87
|
+
ports_list = []
|
81
88
|
ports.each_value do |port|
|
82
89
|
next unless port['localhost'].to_i.between? 1, 65_535
|
83
90
|
|
@@ -85,9 +92,12 @@ module ShipProjectStart
|
|
85
92
|
service = "[#{port['service']} #{port['protocol']}]"
|
86
93
|
description = port['description']
|
87
94
|
description = " (#{description})" if port.key? 'description'
|
88
|
-
|
95
|
+
ports_list << {
|
96
|
+
port: port['localhost'].to_i,
|
97
|
+
string: "#{url.ljust(max_length['url'])} #{service.ljust(max_length['service'])}#{description}"
|
98
|
+
}
|
89
99
|
end
|
90
|
-
|
100
|
+
ports_list
|
91
101
|
end
|
92
102
|
|
93
103
|
# get max length of left column
|
data/lib/takeltau/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.45.
|
1
|
+
0.45.10
|