Merge branch 'master' into reader-1.11.3

sanderdw · Apr 22, 2024 · bb8b8b3 · bb8b8b3
2 parents 6fc3080 + 088b233
commit bb8b8b3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/dsmr_reader/Dockerfile b/dsmr_reader/Dockerfile
@@ -7,19 +7,23 @@ ENV LANG C.UTF-8
 
 RUN apk add --no-cache jq
 
+# Add bashio
 RUN \
-    mkdir -p /usr/src/bashio \
-    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v0.16.2.tar.gz" \
-        | tar -xzf - --strip 1 -C /usr/src/bashio \
-    && mv /usr/src/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    curl -J -L -o /tmp/bashio.tar.gz \
+        "https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz" \
+    && mkdir /tmp/bashio \
+    && tar zxvf \
+        /tmp/bashio.tar.gz \
+        --strip 1 -C /tmp/bashio \
     \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /usr/src/*
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -f -r \
+        /tmp/*
 
 # HOMEASSISTANT Add-On OVERRIDES
 COPY rootfs /
-RUN chmod a+x /etc/s6-overlay/s6-rc.d/set-hassio-vars/run
+RUN chmod a+x /etc/cont-init.d/01-set-hassio-vars
 
 ENV DUID=0
 ENV DGID=0

diff --git a/dsmr_reader/config.json b/dsmr_reader/config.json
@@ -12,7 +12,6 @@
   "ingress": true,
   "panel_icon": "mdi:leaf-circle-outline",
   "hassio_api": true,
-  "init": false,
   "map": ["backup:rw"],
   "ports": {
     "80/tcp": null

diff --git a/...tc/s6-overlay/s6-rc.d/set-hassio-vars/run → ...rootfs/etc/cont-init.d/01-set-hassio-vars b/...tc/s6-overlay/s6-rc.d/set-hassio-vars/run → ...rootfs/etc/cont-init.d/01-set-hassio-vars
@@ -1,4 +1,4 @@
-#!/command/with-contenv bashio
+#!/usr/bin/with-contenv bashio
 
 #---------------------------------------------------------------------------------------------------------------------------
 # HOMEASSISTANT Add-On OVERRIDES

diff --git a/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/init-docker-entrypoint/dependencies b/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/init-docker-entrypoint/dependencies
diff --git a/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/set-hassio-vars/type b/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/set-hassio-vars/type
diff --git a/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/set-hassio-vars/up b/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/set-hassio-vars/up
diff --git a/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/set-hassio-vars b/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/set-hassio-vars