takelage 0.19.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 +6 -4
- 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
|
|
@@ -8,6 +8,8 @@ module DockerContainerLib
|
|
|
8
8
|
|
|
9
9
|
# Create docker container and network.
|
|
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
|
|
@@ -56,8 +58,6 @@ module DockerContainerLib
|
|
|
56
58
|
def _docker_container_lib_create_container(container)
|
|
57
59
|
log.debug "Creating container \"#{container}\""
|
|
58
60
|
|
|
59
|
-
return false if _docker_container_lib_check_matrjoschka
|
|
60
|
-
|
|
61
61
|
image = "#{@docker_user}/#{@docker_repo}:#{@docker_tag}"
|
|
62
62
|
|
|
63
63
|
return false unless _docker_container_lib_image_available? image
|
|
@@ -105,10 +105,12 @@ module DockerContainerLib
|
|
|
105
105
|
|
|
106
106
|
# Check if we are already inside a takelage container
|
|
107
107
|
def _docker_container_lib_check_matrjoschka
|
|
108
|
-
|
|
108
|
+
log.debug 'Checking if we are already inside a takelage container'
|
|
109
|
+
|
|
110
|
+
return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
|
|
109
111
|
|
|
110
112
|
log.error 'You cannot log in to takelage from within takelage'
|
|
111
|
-
|
|
113
|
+
true
|
|
112
114
|
end
|
|
113
115
|
|
|
114
116
|
# Check if docker image is available
|
data/lib/takelage/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.19.
|
|
1
|
+
0.19.2
|