mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-01-01 00:06:18 +00:00
58d70e417b
Adapters for Home Assistant and NodeRED integration are added. Akkudoktor-EOS can now be run as Home Assistant add-on and standalone. As Home Assistant add-on EOS uses ingress to fully integrate the EOSdash dashboard in Home Assistant. The fix includes several bug fixes that are not directly related to the adapter implementation but are necessary to keep EOS running properly and to test and document the changes. * fix: development version scheme The development versioning scheme is adaptet to fit to docker and home assistant expectations. The new scheme is x.y.z and x.y.z.dev<hash>. Hash is only digits as expected by home assistant. Development version is appended by .dev as expected by docker. * fix: use mean value in interval on resampling for array When downsampling data use the mean value of all values within the new sampling interval. * fix: default battery ev soc and appliance wh Make the genetic simulation return default values for the battery SoC, electric vehicle SoC and appliance load if these assets are not used. * fix: import json string Strip outer quotes from JSON strings on import to be compliant to json.loads() expectation. * fix: default interval definition for import data Default interval must be defined in lowercase human definition to be accepted by pendulum. * fix: clearoutside schema change * feat: add adapters for integrations Adapters for Home Assistant and NodeRED integration are added. Akkudoktor-EOS can now be run as Home Assistant add-on and standalone. As Home Assistant add-on EOS uses ingress to fully integrate the EOSdash dashboard in Home Assistant. * feat: allow eos to be started with root permissions and drop priviledges Home assistant starts all add-ons with root permissions. Eos now drops root permissions if an applicable user is defined by paramter --run_as_user. The docker image defines the user eos to be used. * feat: make eos supervise and monitor EOSdash Eos now not only starts EOSdash but also monitors EOSdash during runtime and restarts EOSdash on fault. EOSdash logging is captured by EOS and forwarded to the EOS log to provide better visibility. * feat: add duration to string conversion Make to_duration to also return the duration as string on request. * chore: Use info logging to report missing optimization parameters In parameter preparation for automatic optimization an error was logged for missing paramters. Log is now down using the info level. * chore: make EOSdash use the EOS data directory for file import/ export EOSdash use the EOS data directory for file import/ export by default. This allows to use the configuration import/ export function also within docker images. * chore: improve EOSdash config tab display Improve display of JSON code and add more forms for config value update. * chore: make docker image file system layout similar to home assistant Only use /data directory for persistent data. This is handled as a docker volume. The /data volume is mapped to ~/.local/share/net.akkudoktor.eos if using docker compose. * chore: add home assistant add-on development environment Add VSCode devcontainer and task definition for home assistant add-on development. * chore: improve documentation
100 lines
3.0 KiB
Docker
100 lines
3.0 KiB
Docker
# syntax=docker/dockerfile:1.7
|
|
# Dockerfile
|
|
|
|
# Support both Home Assistant builds and standalone builds
|
|
# Only Debian based images are supported (no Alpine)
|
|
ARG BUILD_FROM
|
|
ARG PYTHON_VERSION=3.13.9
|
|
|
|
# If BUILD_FROM is set (Home Assistant), use it; otherwise use python-slim
|
|
FROM ${BUILD_FROM:-python:${PYTHON_VERSION}-slim}
|
|
|
|
LABEL \
|
|
io.hass.version="VERSION" \
|
|
io.hass.type="addon" \
|
|
io.hass.arch="aarch64|amd64" \
|
|
source="https://github.com/Akkudoktor-EOS/EOS"
|
|
|
|
ENV EOS_DIR="/opt/eos"
|
|
# Create persistent data directory similar to home assistant add-on
|
|
# - EOS_DATA_DIR: Persistent data directory
|
|
# - MPLCONFIGDIR: user customizations to Mathplotlib
|
|
ENV EOS_DATA_DIR="/data"
|
|
ENV EOS_CACHE_DIR="${EOS_DATA_DIR}/cache"
|
|
ENV EOS_OUTPUT_DIR="${EOS_DATA_DIR}/output"
|
|
ENV EOS_CONFIG_DIR="${EOS_DATA_DIR}/config"
|
|
ENV MPLCONFIGDIR="${EOS_DATA_DIR}/mplconfigdir"
|
|
|
|
# Overwrite when starting the container in a production environment
|
|
ENV EOS_SERVER__EOSDASH_SESSKEY=s3cr3t
|
|
|
|
# Set environment variables to reduce threading needs
|
|
ENV OPENBLAS_NUM_THREADS=1
|
|
ENV OMP_NUM_THREADS=1
|
|
ENV MKL_NUM_THREADS=1
|
|
ENV PIP_PROGRESS_BAR=off
|
|
ENV PIP_NO_COLOR=1
|
|
|
|
# Generic environment
|
|
ENV LANG=C.UTF-8
|
|
ENV VENV_PATH=/opt/venv
|
|
# - Use .venv for python commands
|
|
ENV PATH="$VENV_PATH/bin:$PATH"
|
|
|
|
WORKDIR ${EOS_DIR}
|
|
|
|
# Create eos user and data directories with eos user permissions
|
|
RUN apt-get update && apt-get install -y --no-install-recommends adduser \
|
|
&& adduser --system --group --no-create-home eos \
|
|
&& mkdir -p "${EOS_DATA_DIR}" \
|
|
&& chown -R eos:eos "${EOS_DATA_DIR}" \
|
|
&& mkdir -p "${EOS_CACHE_DIR}" "${EOS_OUTPUT_DIR}" "${EOS_CONFIG_DIR}" "${MPLCONFIGDIR}" \
|
|
&& chown -R eos:eos "${EOS_CACHE_DIR}" "${EOS_OUTPUT_DIR}" "${EOS_CONFIG_DIR}" "${MPLCONFIGDIR}"
|
|
|
|
# Install build dependencies (Debian)
|
|
# - System deps
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
python3-venv \
|
|
gcc g++ gfortran \
|
|
libopenblas-dev liblapack-dev \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# - Create venv
|
|
RUN python3 -m venv ${VENV_PATH}
|
|
|
|
# - Upgrade pip inside venv
|
|
RUN pip install --upgrade pip setuptools wheel
|
|
|
|
# - Install deps
|
|
COPY requirements.txt .
|
|
RUN pip install --no-cache-dir -r requirements.txt
|
|
|
|
# Install EOS/ EOSdash
|
|
# - Copy source
|
|
COPY src/ ./src
|
|
COPY pyproject.toml .
|
|
|
|
# - Create version information
|
|
COPY scripts/get_version.py ./scripts/get_version.py
|
|
RUN python scripts/get_version.py > ./version.txt
|
|
RUN rm ./scripts/get_version.py
|
|
|
|
RUN echo "Building Akkudoktor-EOS with Python $PYTHON_VERSION"
|
|
|
|
# - Install akkudoktoreos package in editable form (-e)
|
|
# - pyproject-toml will read the version from version.txt
|
|
RUN pip install --no-cache-dir -e .
|
|
|
|
ENTRYPOINT []
|
|
|
|
EXPOSE 8504
|
|
EXPOSE 8503
|
|
|
|
# Ensure EOS and EOSdash bind to 0.0.0.0
|
|
# EOS is started with root provileges. EOS will drop root proviledges and switch to user eos.
|
|
CMD ["python", "-m", "akkudoktoreos.server.eos", "--host", "0.0.0.0", "--run_as_user", "eos"]
|
|
|
|
# Persistent data
|
|
# (Not recognized by home assistant add-on management, but there we have /data anyway)
|
|
VOLUME ["${EOS_DATA_DIR}"]
|