Merge pull request #18 from bitswan-space/feature/pre-env-default

add option for default env vars for global services
bitswan-space · Apr 24, 2024 · ed30d1c · ed30d1c
2 parents de58227 + accac8e
commit ed30d1c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/pre/main.ipynb b/pre/main.ipynb
@@ -381,7 +381,7 @@
     "\n",
     "    data_machines = bitswan_yaml.get(\"data-machines\", {})\n",
     "    data_machines = data_machines if data_machines else {}\n",
-    "    \n",
+    "\n",
     "    for deployment_id, conf in data_machines.items():\n",
     "        if conf is None:\n",
     "            conf = {}\n",
@@ -395,9 +395,13 @@
     "            \"gitops.deployment_id\": deployment_id,\n",
     "        }\n",
     "        if \"env-dir\" in bitswan_yaml:\n",
-    "           env_file = os.path.join(bitswan_yaml[\"env-dir\"], deployment_id)\n",
-    "           if os.path.exists(env_file):\n",
-    "               entry[\"env_file\"] = [env_file]\n",
+    "            entry[\"env_file\"] = []\n",
+    "            env_file = os.path.join(bitswan_yaml[\"env-dir\"], deployment_id)\n",
+    "            if os.path.exists(env_file):\n",
+    "                entry[\"env_file\"].append(env_file)\n",
+    "            env_default_file = os.path.join(bitswan_yaml[\"env-dir\"], \"default\")\n",
+    "            if os.path.exists(env_default_file):\n",
+    "                entry[\"env_file\"].append(env_default_file)\n",
     "\n",
     "        if \"network_mode\" in conf:\n",
     "            entry[\"network_mode\"] = conf[\"network_mode\"]\n",