takelage 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c7e30c19e8a11de8ad95a88ed10b273a0266205de6eef10601331b5f6f2e99
-  data.tar.gz: 3b45502b409d12f35aabbbb0cae6cdbd33ff108f245fa9a01c1c6c5acd3e04cd
+  metadata.gz: 6aa0131de034a40fab39f1bdc5435a6b0fc7492fb04095e9ce9cafdafd0397f7
+  data.tar.gz: c692ea862efc2de07fc8dee8b270ea619be072bffc55e6aaa1161ac213a98ef1
 SHA512:
-  metadata.gz: 7c23d454347c4983a240601f744198709cb7368edaa5baccddcc0f483ef1cd9aef1f9e04f338420764f5337fba84b181cfb95cccc222e6190fa50ae87789e7a4
-  data.tar.gz: 4a44ee37503a14484500b84bedf50597e966d084f9925886ba3af8eb0577c4d1313f939f54fb07feb89468e604c696fb65a0ea534f2d35e9f05aff82f867ffcd
+  metadata.gz: 368e12c99f24c3b3ecc0d514f316185a7fc3db8fb655aed1638c495e79dec54007f0949ef30a175bfefa1b96e677112c40bc306c9269aa7764b798a38080a479
+  data.tar.gz: a93aaa7eac509fcdb520b059e8635d3b23b7e63400e7eb213ecd1477406483cbf236ea2c8ec41f0c851202906cb8f2ef0baa91692450c9f67729191a11ce0e66

data/lib/takelage/docker/container/lib.rb

@@ -8,6 +8,8 @@ module DockerContainerLib
 
   # Create docker container and network.
   def _docker_container_lib_create_net_and_ctr(name)
+    return false if _docker_container_lib_check_matrjoschka
+
     unless docker_container_check_network name
       _docker_container_lib_create_network name
     end
@@ -56,8 +58,6 @@ module DockerContainerLib
   def _docker_container_lib_create_container(container)
     log.debug "Creating container \"#{container}\""
 
-    return false if _docker_container_lib_check_matrjoschka
-
     image = "#{@docker_user}/#{@docker_repo}:#{@docker_tag}"
 
     return false unless _docker_container_lib_image_available? image
@@ -105,10 +105,12 @@ module DockerContainerLib
 
   # Check if we are already inside a takelage container
   def _docker_container_lib_check_matrjoschka
-    return false unless ENV['HOSTNAME'].start_with? @docker_repo
+    log.debug 'Checking if we are already inside a takelage container'
+
+    return false unless ENV.keys.include? 'TAKELAGE_PROJECT_BASE_DIR'
 
     log.error 'You cannot log in to takelage from within takelage'
-    false
+    true
   end
 
   # Check if docker image is available

data/lib/takelage/version

@@ -1 +1 @@
-0.19.1
+0.19.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Geospin