feat: add dsmr_datalogger_api_client.py and update scripts to use abs…

…olute paths
sanderdw · Jan 2, 2025 · 0af7516 · 0af7516
1 parent a42bd56
commit 0af7516
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/dsmr_datalogger/Dockerfile b/dsmr_datalogger/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM
+ARG BUILD_FROM=busybox:dummy
 FROM $BUILD_FROM
 ARG BUILD_ARCH
 ARG HA_RELEASE
@@ -7,7 +7,6 @@ ENV LANG=C.UTF-8
 # Copy data for add-on
 COPY config.json /app/ha_addon_version.json
 COPY rootfs /
-COPY dsmr_datalogger_api_client.py /run/s6/legacy-services/example/dsmr_datalogger_api_client.py
 COPY requirements.txt /
 RUN mkdir -p /etc/dsmr_logs
 RUN pip install --no-cache-dir -r requirements.txt

diff --git a/dsmr_datalogger/rootfs/etc/services.d/example/run b/dsmr_datalogger/rootfs/etc/services.d/example/run
@@ -42,8 +42,4 @@ function _hass {
 _hass
 
 ## Run your program
-_info "EXEC"
-pwd
-python -V
-python /run/s6/legacy-services/example/dsmr_datalogger_api_client.py
-_info "EXEC"
+exec /usr/bin/my_program
diff --git a/..._datalogger/dsmr_datalogger_api_client.py → ...tfs/usr/bin/dsmr_datalogger_api_client.py b/..._datalogger/dsmr_datalogger_api_client.py → ...tfs/usr/bin/dsmr_datalogger_api_client.py
diff --git a/dsmr_datalogger/rootfs/usr/bin/my_program b/dsmr_datalogger/rootfs/usr/bin/my_program
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-pwd
-python -V
-python /run/s6/legacy-services/example/dsmr_datalogger_api_client.py
+python /usr/bin/dsmr_datalogger_api_client.py