fixing test with 'WITH_DOCKER' variable

Alexis Koralewski
1 parent b183b691
Showing 2 changed files with 9 additions and 5 deletions Show diff stats
pyros.py
src/core/pyros_django/pyros/settings.py
@@ -11,7 +11,7 @@ import signal
 import subprocess
 import sys
 import time
-
+import re
  
  
  
@@ -128,8 +128,7 @@ try :
 except KeyError:
     WITH_DOCKER=False
  
-# we can modify this test to be stronger (i.e match only "yes|Yes|y|Y")
-if WITH_DOCKER is str and WITH_DOCKER.startswith("y") : 
+if type(WITH_DOCKER) is str and re.match("^y$|^Y$|^yes$|^Yes$",WITH_DOCKER.rstrip()) != None : 
     WITH_DOCKER = True 
 else : 
     WITH_DOCKER = False
@@ -44,7 +44,7 @@ MODULES_VERSIONS = {
  
  
  
-import os
+import os,re
  
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -64,10 +64,15 @@ DEBUG = True
  
 # added 0.0.0.0, maybe try to map ip on docker -> search docker django runserver on localhost
 try:
-    WITH_DOCKER = os.environ.get('WITH_DOCKER')
+    WITH_DOCKER=os.environ['WITH_DOCKER']
 except KeyError:
     WITH_DOCKER = False
  
+if type(WITH_DOCKER) is str and re.match("^y$|^Y$|^yes$|^Yes$",WITH_DOCKER.rstrip()) != None : 
+    WITH_DOCKER = True 
+else : 
+    WITH_DOCKER = False
+
 ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'pyros.irap.omp.eu']
 if WITH_DOCKER:
     ALLOWED_HOSTS.append('0.0.0.0')