takelage 0.17.1 → 0.19.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/takelage/docker/container/lib.rb +14 -6
- data/lib/takelage/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: 6aa0131de034a40fab39f1bdc5435a6b0fc7492fb04095e9ce9cafdafd0397f7
|
|
4
|
+
data.tar.gz: c692ea862efc2de07fc8dee8b270ea619be072bffc55e6aaa1161ac213a98ef1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 368e12c99f24c3b3ecc0d514f316185a7fc3db8fb655aed1638c495e79dec54007f0949ef30a175bfefa1b96e677112c40bc306c9269aa7764b798a38080a479
|
|
7
|
+
data.tar.gz: a93aaa7eac509fcdb520b059e8635d3b23b7e63400e7eb213ecd1477406483cbf236ea2c8ec41f0c851202906cb8f2ef0baa91692450c9f67729191a11ce0e66
|
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
# takelage docker container lib
|
|
4
4
|
# rubocop:disable Metrics/ModuleLength
|
|
5
|
+
# rubocop:disable Style/IfUnlessModifier
|
|
5
6
|
module DockerContainerLib
|
|
6
7
|
private
|
|
7
8
|
|
|
8
9
|
# Create docker container and network.
|
|
9
|
-
# rubocop:disable Style/IfUnlessModifier
|
|
10
10
|
def _docker_container_lib_create_net_and_ctr(name)
|
|
11
|
+
return false if _docker_container_lib_check_matrjoschka
|
|
12
|
+
|
|
11
13
|
unless docker_container_check_network name
|
|
12
14
|
_docker_container_lib_create_network name
|
|
13
15
|
end
|
|
@@ -16,10 +18,8 @@ module DockerContainerLib
|
|
|
16
18
|
|
|
17
19
|
_docker_container_lib_create_container name
|
|
18
20
|
end
|
|
19
|
-
# rubocop:enable Style/IfUnlessModifier
|
|
20
21
|
|
|
21
22
|
# Remove docker networks.
|
|
22
|
-
# rubocop:disable Style/IfUnlessModifier
|
|
23
23
|
def _docker_container_lib_remove_networks(networks)
|
|
24
24
|
networks.each do |network|
|
|
25
25
|
if docker_container_check_network network
|
|
@@ -27,7 +27,6 @@ module DockerContainerLib
|
|
|
27
27
|
end
|
|
28
28
|
end
|
|
29
29
|
end
|
|
30
|
-
# rubocop:enable Style/IfUnlessModifier
|
|
31
30
|
|
|
32
31
|
# Create docker network.
|
|
33
32
|
def _docker_container_lib_create_network(network)
|
|
@@ -56,7 +55,6 @@ module DockerContainerLib
|
|
|
56
55
|
# Create docker container.
|
|
57
56
|
# rubocop:disable Metrics/MethodLength
|
|
58
57
|
# rubocop:disable Metrics/AbcSize
|
|
59
|
-
# rubocop:disable Style/IfUnlessModifier
|
|
60
58
|
def _docker_container_lib_create_container(container)
|
|
61
59
|
log.debug "Creating container \"#{container}\""
|
|
62
60
|
|
|
@@ -102,10 +100,19 @@ module DockerContainerLib
|
|
|
102
100
|
|
|
103
101
|
try cmd_docker_create
|
|
104
102
|
end
|
|
105
|
-
# rubocop:enable Style/IfUnlessModifier
|
|
106
103
|
# rubocop:enable Metrics/AbcSize
|
|
107
104
|
# rubocop:enable Metrics/MethodLength
|
|
108
105
|
|
|
106
|
+
# Check if we are already inside a takelage container
|
|
107
|
+
def _docker_container_lib_check_matrjoschka
|
|
108
|
+
log.debug 'Checking if we are already inside a takelage container'
|
|
109
|
+
|
|
110
|
+
return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
|
|
111
|
+
|
|
112
|
+
log.error 'You cannot log in to takelage from within takelage'
|
|
113
|
+
true
|
|
114
|
+
end
|
|
115
|
+
|
|
109
116
|
# Check if docker image is available
|
|
110
117
|
def _docker_container_lib_image_available?(image)
|
|
111
118
|
return true if docker_image_tag_list_local.include? @docker_tag
|
|
@@ -157,4 +164,5 @@ module DockerContainerLib
|
|
|
157
164
|
run cmd_docker_stop
|
|
158
165
|
end
|
|
159
166
|
end
|
|
167
|
+
# rubocop:enable Style/IfUnlessModifier
|
|
160
168
|
# rubocop:enable Metrics/ModuleLength
|
data/lib/takelage/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.19.2
|