diff --git a/predbat/CHANGELOG.md b/predbat/CHANGELOG.md new file mode 100644 index 0000000..1fc3852 --- /dev/null +++ b/predbat/CHANGELOG.md @@ -0,0 +1,16 @@ +# Predbat_addon CHANGELOG + +## 1.5.42 + +- added changelog + +## 1.5.41 + +- Add Jinja2 to the addon requirements by @iainfogg in #22 +- Update DOCS.md, add link to Predbat upgrade instructions by @gcoan in #19 + +## 1.5.4 + +- Change to using Ingress for web i/f +- Allows installation of Predbat addon by @ASTPlatinum in #7 +- Increase number of file generations of logfile retained by @gcoan in #11 diff --git a/predbat/Dockerfile b/predbat/Dockerfile index 5a224b0..4c90237 100644 --- a/predbat/Dockerfile +++ b/predbat/Dockerfile @@ -4,25 +4,15 @@ ARG BUILD_VERSION FROM $BUILD_FROM # Set shell -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/sh", "-o", "pipefail", "-c"] -# Install Python and pip in a single layer -# Using python3 instead of python3-minimal for better pip package compatibility -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y --no-install-recommends \ - python3 \ - python3-pip \ - && rm -rf /var/lib/apt/lists/* +WORKDIR /config +ADD rootfs requirements.txt / -WORKDIR /app_data -COPY rootfs / -# COPY ingress.conf /etc/nginx/http.d/ +RUN apk add py3-pip; \ + pip install --no-cache-dir --break-system-packages -r /requirements.txt && rm /requirements.txt -COPY requirements.txt /tmp/ -RUN pip install --break-system-packages -r /tmp/requirements.txt - -# Start app +# #make app executable RUN chmod a+x /run.sh ARG BUILD_ARCH @@ -50,5 +40,3 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} - -#CMD [ "/run.sh" ] diff --git a/predbat/build.yaml b/predbat/build.yaml index a993b26..084d3aa 100644 --- a/predbat/build.yaml +++ b/predbat/build.yaml @@ -1,10 +1,5 @@ --- build_from: - amd64: "ghcr.io/hassio-addons/ubuntu-base/amd64:10.0.5" - aarch64: "ghcr.io/hassio-addons/ubuntu-base/aarch64:10.0.5" - armhf: "ghcr.io/hassio-addons/ubuntu-base/armhf:10.0.5" - armv7: "ghcr.io/hassio-addons/ubuntu-base/armv7:10.0.5" - i386: "ghcr.io/hassio-addons/ubuntu-base/i386:10.0.5" -codenotary: - base_image: tdlj@tdlj.net - signer: tdlj@tdlj.net + amd64: "ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.23-2026.02.0" + aarch64: "ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.23-2026.02.0" + diff --git a/predbat/config.yaml b/predbat/config.yaml index 51c2625..6036a82 100644 --- a/predbat/config.yaml +++ b/predbat/config.yaml @@ -1,10 +1,10 @@ --- name: Predbat -version: 1.5.2 +version: 1.5.43 slug: predbat description: Home Battery Prediction and Control -url: https://github.com/springfall2008/predbat_addon -codenotary: tdlj@tdlj.net +url: https://github.com/nipar4/predbat_addon +#image: docker.io/nipar44/predbat_addon:{arch}-1.3.2 ingress: True ingress_port: 5052 ingress_root: "/" @@ -14,7 +14,6 @@ ports: arch: - aarch64 - amd64 - - armv7 init: false homeassistant_api: true hassio_api: true @@ -23,9 +22,7 @@ auth_api: true map: - addon_config:rw - homeassistant_config:rw - - media:rw - - share:rw - - ssl +# - data:rw options: dummy: [] schema: