Feature/config nested

.dockerignore

@@ -1,8 +1,8 @@
 .git/
 .github/
-eos-data/
-mariadb-data/
-test_data/
+**/__pycache__/
+**/*.pyc
+**/*.egg-info/
 .dockerignore
 .env
 .gitignore
@@ -12,4 +12,4 @@ LICENSE
 Makefile
 NOTICE
 README.md
-.venv
+.venv/

.env

@@ -1,4 +1,5 @@
 EOS_VERSION=main
-EOS_PORT=8503
+EOS_SERVER__PORT=8503
+EOS_SERVER__EOSDASH_PORT=8504
 
 PYTHON_VERSION=3.12.6

.gitignore

@@ -260,3 +260,6 @@ tests/testdata/new_optimize_result*
 tests/testdata/openapi-new.json
 tests/testdata/openapi-new.md
 tests/testdata/config-new.md
+
+# FastHTML session key
+.sesskey

Dockerfile

@@ -3,8 +3,6 @@ FROM python:${PYTHON_VERSION}-slim
 
 LABEL source="https://github.com/Akkudoktor-EOS/EOS"
 
-ENV VIRTUAL_ENV="/opt/venv"
-ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 ENV MPLCONFIGDIR="/tmp/mplconfigdir"
 ENV EOS_DIR="/opt/eos"
 ENV EOS_CACHE_DIR="${EOS_DIR}/cache"

README.md

@@ -52,6 +52,8 @@ Windows:
 docker compose up
 ```
 
+If you are running the EOS container on a system hosting multiple services, such as a Synology NAS, and want to allow external network access to EOS, please ensure that the default exported ports (8503, 8504) are available on the host. On Synology systems, these ports might already be in use (refer to [this guide](https://kb.synology.com/en-me/DSM/tutorial/What_network_ports_are_used_by_Synology_services)). If the ports are occupied, you will need to reconfigure the exported ports accordingly.
+
 ## Configuration
 
 This project uses the `EOS.config.json` file to manage configuration settings.

docker-compose.yaml

@@ -11,12 +11,15 @@ services:
       dockerfile: "Dockerfile"
       args:
         PYTHON_VERSION: "${PYTHON_VERSION}"
+    env_file:
+      - .env
     environment:
       - EOS_CONFIG_DIR=config
-      - latitude=52.2
-      - longitude=13.4
-      - elecprice_provider=ElecPriceAkkudoktor
-      - elecprice_charges_kwh=0.21
-      - server_fasthtml_host=none
+      - EOS_SERVER__EOSDASH_SESSKEY=s3cr3t
+      - EOS_PREDICTION__LATITUDE=52.2
+      - EOS_PREDICTION__LONGITUDE=13.4
+      - EOS_ELECPRICE__PROVIDER=ElecPriceAkkudoktor
+      - EOS_ELECPRICE__CHARGES_KWH=0.21
     ports:
-      - "${EOS_PORT}:${EOS_PORT}"
+      - "${EOS_SERVER__PORT}:${EOS_SERVER__PORT}"
+      - "${EOS_SERVER__EOSDASH_PORT}:${EOS_SERVER__EOSDASH_PORT}"