Take changes from springfall2008#1

Author: sammort

Dockerfile

@@ -1,30 +1,14 @@
-#install python en pip
-FROM ubuntu:noble
+FROM python:3-slim-bookworm
 
-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+WORKDIR /
+COPY predbat/rootfs /
+COPY predbat/requirements.txt /
 
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get dist-upgrade -y
-RUN apt-get install -y python3
-RUN apt-get install -y python3-pip
-RUN apt-get install -y python3-venv
-RUN apt-get install -y python3-requests
-RUN apt-get install -y python3-yaml
-#RUN apt-get install -y python3-asyncio
-RUN apt-get install -y python3-aiohttp
-RUN apt-get install csh
-RUN apt-get install -y python3-tz
-
-WORKDIR /config
-COPY predbat/rootfs /config
-
-#COPY requirements.txt /tmp/
-#RUN pip3 install -r /tmp/requirements.txt
+# Install dependencies
+RUN pip3 --no-cache-dir install -r /requirements.txt
 
 # Start app
-RUN chmod a+x run.csh
+RUN chmod a+x run.sh
 
 ARG BUILD_ARCH
 ARG BUILD_DATE
@@ -52,4 +36,4 @@ LABEL \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
 
-CMD [ "csh", "-f", "run.csh"]
+ENTRYPOINT /run.sh

predbat/requirements.txt

@@ -2,4 +2,4 @@ pytz
 requests
 pyyaml
 asyncio
-aiohttp==3.8.6
+aiohttp>=3.8.6

predbat/rootfs/run.sh

@@ -1,8 +1,35 @@
-echo "Running Predbat inside Add-on"
-echo "Your API key is: $SUPERVISOR_TOKEN"
+#!/bin/bash
+
+ROOT_DIR="/config"
+[[ -d ${ROOT_DIR} ]] || ROOT_DIR="./"
+
+if [[ -n ${SUPERVISOR_TOKEN} ]]; then
+  echo "Running Predbat inside Add-on"
+  echo "Your API key is: ${SUPERVISOR_TOKEN}"
+fi
+
 if [ -f /config/dev ]; then
     echo "Dev mode enabled, not copying hass.py"
 else
-    cp /hass.py /config/hass.py
+    [[ ! -f ${ROOT_DIR}/hass.py ]] && cp /hass.py ${ROOT_DIR}/hass.py
 fi
-python3 /startup.py $SUPERVISOR_TOKEN
+
+## Bootstrap predbat
+python3 /bootstrap.py 
+
+## Run
+if [[ $? -eq 0 ]]; then
+  echo "Starting Predbat..."
+  ## Loop if running in HA otherwise let container properties deal with restart
+  if [[ -n ${SUPERVISOR_TOKEN} ]]; then
+    while true; do
+      cd ${ROOT_DIR} && python3 hass.py
+      echo "Predbat crashed. Restarting in 5 seconds..."
+      sleep 5
+    done
+  else
+    cd ${ROOT_DIR} && python3 hass.py
+  fi
+else
+  echo "Bootstrap failed"
+fi

predbat/rootfs/startup.py

@@ -13,7 +13,7 @@
     root = "./"
 
 # Download the latest Predbat release from Github
-if not os.path.exists(root + "/apps.yaml"):
+if not os.path.exists(root + "/predbat.py"):
     url = "https://api.github.com/repos/springfall2008/batpred/releases"
     print("Download Predbat release list from {}".format(url))
     try:
@@ -60,17 +60,14 @@
         shutil.unpack_archive(save_path, unzip_path)
         unzip_path = unzip_path + "/batpred-" + tag_name.replace("v", "")
         os.system("cp {}/apps/predbat/* {}".format(unzip_path, root))
-        os.system("cp {}/apps/predbat/config/* {}".format(unzip_path, root))
-        os.system("rm -rf {}".format(unzip_path))
+        if not os.path.exists(root + "/apps.yaml"):
+            print("No apps.yaml found - extracting default.")
+            os.system("cp {}/apps/predbat/config/* {}".format(unzip_path, root))
     else:
         print("Error: Unable to find a valid Predbat release")
         print("Sleep 5 minutes before restarting")
         time.sleep(5*60)
         sys.exit(1)
 
 
-print("Startup")
-os.system("cd " + root + "; python3 hass.py")
-
-print("Shutdown, sleeping 30 seconds before restarting")
-time.sleep(30)
+print("Bootstrapped!")