takeltau 0.44.42 → 0.45.2
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/lib/system.rb +3 -0
- data/lib/takeltau/ship/container/lib.rb +23 -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: c2e96464eaa3828e6ad5be454d94ba5f3f43663276353053309599f1d9accd0f
|
|
4
|
+
data.tar.gz: c1bc776c1b8fecac6205452eb098f8ce31a3e23380e4cf77a6262679a333215b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 613ca5c105e0552cd446152bf0ffc4922c208709f9aba666c891f465bd05e798f3001ca19fed65466122547da31b0113a0d712d4e5d5cbaef40d70d9f583207a
|
|
7
|
+
data.tar.gz: e9bad2dc78c5fa95240897f020ffffafb196708238586a8df5817e87a396871e5c264f857c58fb5485bb529432fdb3889a245fdef2bb7adde6a440401a28f988
|
data/lib/takeltau/lib/system.rb
CHANGED
|
@@ -95,6 +95,9 @@ module SystemModule
|
|
|
95
95
|
|
|
96
96
|
# Use Kernel#exec to replace the ruby process with a command.
|
|
97
97
|
def run_and_exit(command)
|
|
98
|
+
trap 'SIGINT' do
|
|
99
|
+
exit
|
|
100
|
+
end
|
|
98
101
|
Dir.chdir(config.active['project_root_dir']) do
|
|
99
102
|
log.debug "Running command \"#{command}\" and exiting afterwards"
|
|
100
103
|
exec command
|
|
@@ -87,13 +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=false' if config.active['ship_update'] == 'false'
|
|
92
|
-
update = "--env TAKELSHIP_UPDATE=#{ENV['TAKELSHIP_UPDATE']}" if ENV.key?('TAKELSHIP_UPDATE')
|
|
93
|
-
ship_env << update
|
|
90
|
+
ship_env << _ship_container_lib_takelship_update
|
|
94
91
|
ship_env.join(' ')
|
|
95
92
|
end
|
|
96
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
|
+
|
|
97
116
|
# Create publish ports string
|
|
98
117
|
def _ship_container_lib_publish(ports, publish_ports)
|
|
99
118
|
return '' unless publish_ports
|
data/lib/takeltau/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.45.2
|