takeltau 0.38.2 → 0.39.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/takeltau/docker/container/lib.rb +0 -3
- data/lib/takeltau/info/status/bar.rb +3 -7
- data/lib/takeltau/info/status/lib.rb +14 -0
- 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: 73f3cdc1423e876043ceea53b0e7209589e7b5474ad44b1213cbffa6336ad7af
|
4
|
+
data.tar.gz: 83a3dfa517ac84b8265a09b64b325184473fd0a22bf98fd241f4713e7e59c0ce
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 923b34a21ed9d509f88be302e3c4e8682adae221d60f59a6a092ba706501ed5de13125a0184e0d7d26130441aeb84c015be119ec9e5a313a4078c11bf17de7e0
|
7
|
+
data.tar.gz: 83eec4fbdd1c53604dce8d1d53fab8d3c94678f997611f294afd6d833dcabcf78315337e427af44234f2562d8c4006d76eb585cdd2ff09afbeef8077d44b168a
|
@@ -122,7 +122,6 @@ module DockerContainerLib
|
|
122
122
|
end
|
123
123
|
|
124
124
|
log.debug 'We are inside a takelage container'
|
125
|
-
|
126
125
|
true
|
127
126
|
end
|
128
127
|
|
@@ -145,9 +144,7 @@ module DockerContainerLib
|
|
145
144
|
)
|
146
145
|
|
147
146
|
name = (run cmd_get_container_name_by_id).chomp
|
148
|
-
|
149
147
|
log.debug "Container #{container} has name \"#{name}\""
|
150
|
-
|
151
148
|
name
|
152
149
|
end
|
153
150
|
|
@@ -29,14 +29,10 @@ module InfoStatusBar
|
|
29
29
|
|
30
30
|
# Add takelage version info to bar.
|
31
31
|
def _info_status_bar_takelage
|
32
|
-
|
33
|
-
unless
|
34
|
-
@bar_status = false
|
35
|
-
return false
|
36
|
-
end
|
32
|
+
# Check if we are inside a takelage docker container
|
33
|
+
return unless _docker_container_lib_check_matrjoschka
|
37
34
|
|
38
|
-
|
39
|
-
@bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
|
35
|
+
@bar_list << _info_status_lib_get_channel_and_version
|
40
36
|
end
|
41
37
|
|
42
38
|
# Add tau version info to bar.
|
@@ -43,4 +43,18 @@ module InfoStatusLib
|
|
43
43
|
)
|
44
44
|
try cmd_git_key_available
|
45
45
|
end
|
46
|
+
|
47
|
+
# Get takelage environment string
|
48
|
+
def _info_status_lib_get_channel_and_version
|
49
|
+
takelage_version_file = '/etc/takelage_version'
|
50
|
+
return '' unless _file_exists? takelage_version_file
|
51
|
+
|
52
|
+
_file_read takelage_version_file
|
53
|
+
|
54
|
+
channel = config.active['docker_repo']
|
55
|
+
version = @content_file.chomp
|
56
|
+
|
57
|
+
log.debug "#{channel}: #{version.green}"
|
58
|
+
"#{channel}: #{version.green}"
|
59
|
+
end
|
46
60
|
end
|
data/lib/takeltau/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.39.0
|