diff --git a/nspanel-lovelace-ui/Dockerfile b/nspanel-lovelace-ui/Dockerfile index 9d1a983c..9f3af230 100644 --- a/nspanel-lovelace-ui/Dockerfile +++ b/nspanel-lovelace-ui/Dockerfile @@ -8,5 +8,35 @@ RUN \ curl -sSLf -o /usr/bin/tempio \ "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" +# Set shell +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +# Copy Python requirements file +COPY requirements.txt /tmp/ + +# Setup base +# hadolint ignore=DL3003,DL3042 +RUN \ + apk add --no-cache --virtual .build-dependencies \ + build-base=0.5-r3 \ + python3-dev=3.11.6-r0 \ + \ + && apk add --no-cache \ + py3-pip=23.1.2-r0 \ + py3-wheel=0.40.0-r1 \ + python3=3.11.6-r0 \ + \ + && pip install -r /tmp/requirements.txt \ + \ + && cd /usr/lib/python3.11/site-packages/ \ + && patch -p1 < /patches/force_recompile.patch \ + \ + && find /usr \ + \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \ + -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ + -exec rm -rf '{}' + \ + \ + && apk del --no-cache --purge .build-dependencies + # Copy root filesystem COPY rootfs / diff --git a/nspanel-lovelace-ui/config.yaml b/nspanel-lovelace-ui/config.yaml index a61bcad4..2fe98295 100644 --- a/nspanel-lovelace-ui/config.yaml +++ b/nspanel-lovelace-ui/config.yaml @@ -1,6 +1,6 @@ # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config name: NSPanel Lovelace UI Addon -version: "4.7.0" +version: "4.7.1" slug: nspanel-lovelace-ui description: NSPanel Lovelace UI Addon url: "https://github.com/joBr99/nspanel-lovelace-ui/tree/main/nspanel-lovelace-ui" diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/run.sh b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/run.sh index 2f2ba8eb..46d5b5bd 100644 --- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/run.sh +++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/run.sh @@ -5,6 +5,6 @@ export CONFIG_FILE=/share/config.yml if test -f "$CONFIG_FILE"; then echo "$CONFIG_FILE exists." else - cp config.yml.example $CONFIG_FILE + cp /usr/bin/mqtt-manager/config.yml.example $CONFIG_FILE fi python main.py \ No newline at end of file