♻️ Maintenance: updates env-vars in api-server ⚠️ (#5083)

Author: pcrespov

.env-devel

@@ -166,6 +166,7 @@ WEBSERVER_ANNOUNCEMENTS=1
 WEBSERVER_DEV_FEATURES_ENABLED=0
 
 WEBSERVER_HOST=webserver
+WEBSERVER_PORT=8080
 
 WEBSERVER_CATALOG={}
 CATALOG_HOST=catalog

.vscode/extensions.json

@@ -4,6 +4,7 @@
     "charliermarsh.ruff",
     "eamodio.gitlens",
     "exiasr.hadolint",
+    "hediet.vscode-drawio",
     "ms-azuretools.vscode-docker",
     "ms-python.black-formatter",
     "ms-python.pylint",

services/api-server/setup.py

@@ -22,7 +22,7 @@ def read_reqs(reqs_path: Path) -> set[str]:
 
 NAME = "simcore-service-api-server"
 VERSION = (CURRENT_DIR / "VERSION").read_text().strip()
-AUTHORS = "Pedro Crespo-Valero (pcrespov)"
+AUTHORS = ("Pedro Crespo-Valero (pcrespov)", "Mads Bisgaard (bisgaard-itis)")
 DESCRIPTION = "Platform's API Server for external clients"
 README = (CURRENT_DIR / "README.md").read_text()
 
@@ -39,30 +39,30 @@ def read_reqs(reqs_path: Path) -> set[str]:
 
 TEST_REQUIREMENTS = tuple(read_reqs(CURRENT_DIR / "requirements" / "_test.txt"))
 
-SETUP = dict(
-    name=NAME,
-    version=VERSION,
-    author=AUTHORS,
-    description=DESCRIPTION,
-    long_description=README,
-    license="MIT license",
-    python_requires="~=3.10",
-    packages=find_packages(where="src"),
-    package_dir={
+SETUP = {
+    "name": NAME,
+    "version": VERSION,
+    "author": AUTHORS,
+    "description": DESCRIPTION,
+    "long_description": README,
+    "license": "MIT license",
+    "python_requires": "~=3.10",
+    "packages": find_packages(where="src"),
+    "package_dir": {
         "": "src",
     },
-    include_package_data=True,
-    install_requires=PROD_REQUIREMENTS,
-    test_suite="tests",
-    tests_require=TEST_REQUIREMENTS,
-    extras_require={"test": TEST_REQUIREMENTS},
-    entry_points={
+    "include_package_data": True,
+    "install_requires": PROD_REQUIREMENTS,
+    "test_suite": "tests",
+    "tests_require": TEST_REQUIREMENTS,
+    "extras_require": {"test": TEST_REQUIREMENTS},
+    "entry_points": {
         "console_scripts": [
             "simcore-service-api-server = simcore_service_api_server.cli:main",
             "simcore-service = simcore_service_api_server.cli:main",
         ],
     },
-)
+}
 
 if __name__ == "__main__":
     setup(**SETUP)

services/docker-compose.yml

@@ -5,11 +5,36 @@ services:
     init: true
     hostname: "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}"
     environment:
-      - WEBSERVER_HOST=${WEBSERVER_HOST:-webserver}
-      - LOG_LEVEL=${LOG_LEVEL:-WARNING}
-      - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
-    env_file:
-      - ../.env
+      - API_SERVER_DEV_FEATURES_ENABLED=${API_SERVER_DEV_FEATURES_ENABLED}
+      - API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
+
+      - CATALOG_HOST=${CATALOG_HOST}
+      - CATALOG_PORT=${CATALOG_PORT}
+
+      - DIRECTOR_V2_HOST=${DIRECTOR_V2_HOST}
+      - DIRECTOR_V2_PORT=${DIRECTOR_V2_PORT}
+
+      - API_SERVER_LOGLEVEL=${API_SERVER_LOGLEVEL:-${LOG_LEVEL:-WARNING}}
+
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_HOST=${POSTGRES_HOST}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_PORT=${POSTGRES_PORT}
+      - POSTGRES_USER=${POSTGRES_USER}
+
+      - RABBIT_HOST=${RABBIT_HOST}
+      - RABBIT_PASSWORD=${RABBIT_PASSWORD}
+      - RABBIT_PORT=${RABBIT_PORT}
+      - RABBIT_SECURE=${RABBIT_SECURE}
+      - RABBIT_USER=${RABBIT_USER}
+
+      - STORAGE_HOST=${STORAGE_HOST}
+      - STORAGE_PORT=${STORAGE_PORT}
+
+      - WEBSERVER_HOST=${WEBSERVER_HOST}
+      - WEBSERVER_PORT=${WEBSERVER_PORT}
+      - WEBSERVER_SESSION_SECRET_KEY=${WEBSERVER_SESSION_SECRET_KEY}
+
     deploy:
       labels:
         - io.simcore.zone=${TRAEFIK_SIMCORE_ZONE}
@@ -433,6 +458,7 @@ services:
       # WEBSERVER_SERVER_HOST
 
       WEBSERVER_HOST: ${WEBSERVER_HOST}
+      WEBSERVER_PORT: ${WEBSERVER_PORT}
 
       # WEBSERVER_SERVER_PORT
 
@@ -619,6 +645,7 @@ services:
       WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL}
 
       WEBSERVER_HOST: ${WEBSERVER_HOST}
+      WEBSERVER_PORT: ${WEBSERVER_PORT}
 
       # WEBSERVER_DB
       POSTGRES_DB: ${POSTGRES_DB}
@@ -702,6 +729,7 @@ services:
       WEBSERVER_LOGLEVEL: ${WB_GC_LOGLEVEL}
 
       WEBSERVER_HOST: ${WEBSERVER_HOST}
+      WEBSERVER_PORT: ${WEBSERVER_PORT}
 
       # WEBSERVER_RESOURCE_USAGE_TRACKER
       RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST}