takeltau 0.44.41 → 0.45.0
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 +2 -1
- data/lib/takeltau/ship/container/lib.rb +23 -3
- 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: 18425fc54e196beadfd93491d38107bf127d3a08e6c5e9a72be0dc42de441a7e
|
|
4
|
+
data.tar.gz: 452128d0b1ee6a8446c632bbbcc9c8f119865bf4d2061bc77206b98567b3edc3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cc01acc0867fa7e5410c07457c753842046a2f5ce15c653014678ca39abc5966a738a59914da17acda7cf5e09f31bd410e2466d7d7a640480f9b9f1a37ab43cf
|
|
7
|
+
data.tar.gz: c1019e1de61d6d060291881080b694397445b922e9373774e5744e502f0cfb9b80212c2d48cc8f15fd2405b60aac6d33dbffb5b4c53afe1c96ff1542216a98ce
|
data/lib/takeltau/default.yml
CHANGED
|
@@ -58,8 +58,8 @@ cmd_mutagen_forward_socket_list: 'mutagen forward list --label-selector="%{takel
|
|
|
58
58
|
cmd_mutagen_forward_socket_remove: 'rm -f ~/.mutagen/daemon/*'
|
|
59
59
|
cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
|
|
60
60
|
cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_hostname} %{command}'
|
|
61
|
-
cmd_ship_container_logs: '%{ship_docker} logs %{ship_hostname} %{args}'
|
|
62
61
|
cmd_ship_container_login: 'bash'
|
|
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
65
|
cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{ship_run_args_nonprivileged} %{image} %{command}'
|
|
@@ -102,4 +102,5 @@ ship_run_args_nonprivileged: ''
|
|
|
102
102
|
ship_run_args_privileged: ''
|
|
103
103
|
ship_tag: 'latest'
|
|
104
104
|
ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/takelship.yml'
|
|
105
|
+
ship_update: 'true'
|
|
105
106
|
ship_user: 'takelwerk'
|
|
@@ -87,12 +87,32 @@ module ShipContainerLib
|
|
|
87
87
|
envstr = "--env #{envvar}=#{port['localhost']}"
|
|
88
88
|
ship_env << envstr
|
|
89
89
|
end
|
|
90
|
-
|
|
91
|
-
update = "--env TAKELSHIP_UPDATE=#{ENV['TAKELSHIP_UPDATE']}" if ENV.key?('TAKELSHIP_UPDATE')
|
|
92
|
-
ship_env << update
|
|
90
|
+
ship_env << _ship_container_lib_takelship_update
|
|
93
91
|
ship_env.join(' ')
|
|
94
92
|
end
|
|
95
93
|
|
|
94
|
+
# add env parameter with update configuration
|
|
95
|
+
def _ship_container_lib_takelship_update
|
|
96
|
+
update_true = '--env TAKELSHIP_UPDATE=true'
|
|
97
|
+
update_false = '--env TAKELSHIP_UPDATE=false'
|
|
98
|
+
log.debug 'Will update by default'
|
|
99
|
+
update = update_true
|
|
100
|
+
unless config.active['ship_update']
|
|
101
|
+
log.debug "Won't update as config key 'ship_update' is 'false'"
|
|
102
|
+
update = update_false
|
|
103
|
+
end
|
|
104
|
+
if ENV.key?('TAKELSHIP_UPDATE')
|
|
105
|
+
if ENV['TAKELSHIP_UPDATE']
|
|
106
|
+
log.debug "Will update as env var 'TAKELSHIP_UPDATE' is 'true'"
|
|
107
|
+
update = update_true
|
|
108
|
+
else
|
|
109
|
+
log.debug "Won't update as env var 'TAKELSHIP_UPDATE' is 'false'"
|
|
110
|
+
update = update_false
|
|
111
|
+
end
|
|
112
|
+
end
|
|
113
|
+
update
|
|
114
|
+
end
|
|
115
|
+
|
|
96
116
|
# Create publish ports string
|
|
97
117
|
def _ship_container_lib_publish(ports, publish_ports)
|
|
98
118
|
return '' unless publish_ports
|
data/lib/takeltau/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.45.0
|