RegEx is evil...

Author: istvank

layersbox

@@ -564,7 +564,7 @@ def update_adapter(config, service_directory, service_name):
         # parse nginx.conf of all services to get a list of all proxied containers
         #TODO: make sure to only read URLs after a "proxy_pass"
         with open(join(service_directory, service_name, "nginx.conf")) as f:
-            for w in re.findall('(https?:\/\/[A-Za-z0-9]+)',f.read()):
+            for w in re.findall('(https?:\/\/[A-Za-z0-9.]+)',f.read()):
                 proxied_servers.append(w.replace('http://', ''))
 
     # now get the IPs of the proxied containers
@@ -714,7 +714,7 @@ def create_databases(dir, service_name, database_env_files):
         db_username = ""
         db_file = ""
         db_exists = False
-        with open(join(servicedir, service_name, env_file)) as infile:
+        with open(join(servicedir, service_name, env_file[0])) as infile:
             for line in infile:
                 if "_DB_NAME" in line:
                     db_key = line.split("_DB_NAME=")[0]
@@ -737,7 +737,7 @@ def create_databases(dir, service_name, database_env_files):
         mysqlcreate_output = subprocess.check_output(["docker-compose", "run", "mysqlcreate"])
         db_password = mysqlcreate_output.split(" -p")[1].split(" -hmysql")[0]
         # write password to env file
-        with open(join(servicedir, service_name, env_file), "a") as outfile:
+        with open(join(servicedir, service_name, env_file[0]), "a") as outfile:
             outfile.write("{}_DB_PASS={}".format(db_key, db_password))
 
         # clean up and delete secret.env content, otherwise db is created again