diff --git a/.gitmodules b/.gitmodules index d679c0a..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "batcontrol/src"] - path = batcontrol/src - url = https://github.com/muexxl/batcontrol.git diff --git a/batcontrol/Dockerfile b/batcontrol/Dockerfile deleted file mode 100644 index 98896eb..0000000 --- a/batcontrol/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -ARG BUILD_FROM -FROM $BUILD_FROM AS builder -# Copy only whats needed for dependencies first -COPY ./src/pyproject.toml ./src/LICENSE ./src/README.MD ./ - -# Copy data for add-on -RUN apk add --no-cache \ - python3 \ - py3-pip \ - py3-setuptools - - - -# RUN pip install --no-cache-dir setuptools>=66.0 - - -# Copy the rest of the source files -COPY ./src/src ./src - - -# Build a wheel from the public Git repo -RUN pip wheel --no-cache-dir --no-deps --wheel-dir=/wheels . - - -# Install build dependencies - -# Stage 2: Build the final image -FROM $BUILD_FROM - -# Copy the built wheel from the builder stage and install it -COPY --from=builder /wheels /wheels - -RUN apk add --no-cache \ - python3 \ - py3-pip \ - py3-setuptools -RUN pip install --no-cache-dir --break-system-packages --extra-index-url https://piwheels.org/simple --prefer-binary /wheels/*.whl -# RUN rm -rf /wheels - - -ENV BATCONTROL_VERSION=${VERSION} -ENV BATCONTROL_GIT_SHA=${GIT_SHA} -# Set default timezone to UTC, override with -e TZ=Europe/Berlin or similar -# when starting the container -# or set the timezone in docker-compose.yml in the environment section, -ENV TZ=UTC - -# Create the app directory and copy the app files -RUN mkdir -p /app /app/logs /app/config -WORKDIR /app - -# The load profiles to all locations where it is needed -COPY src/config/load_profile_default.csv ./config/load_profile.csv -COPY src/config/load_profile_default.csv ./default_load_profile.csv - -# Copy all the other necessary runtime files -COPY LICENSE src/entrypoint_ha.sh ./ -COPY src/config ./config_template - -# Set the scripts as executable -RUN chmod +x entrypoint_ha.sh - -# COPY ./src/run_infinite.sh ./run_infinite.sh -# CMD [ "./run_infinite.sh" ] -CMD [ "./entrypoint_ha.sh" ] diff --git a/batcontrol/config.yaml b/batcontrol/config.yaml index 8be33b6..b57cb2a 100644 --- a/batcontrol/config.yaml +++ b/batcontrol/config.yaml @@ -1,7 +1,13 @@ name: "Batcontrol" description: "Controls the charging of the battery" -version: "0.5.1" +version: 0.5.1 slug: "batcontrol" +url: https://hub.docker.com/r/muexx/batcontrol +startup: application +boot: auto +legacy: true +stage: stable +image: muexx/batcontrol init: false arch: - aarch64 @@ -13,7 +19,10 @@ map: - type: ssl - type: addon_config read_only: false - path: /app/addon_config + path: /app +host_network: true +environment: + TZ: ${timezone} options: timezone: Europe/Berlin #your time zone. not optional. diff --git a/batcontrol/src b/batcontrol/src deleted file mode 160000 index 6686352..0000000 --- a/batcontrol/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 668635254ac461f9e095dc171fe4620ac43e0409