Merge pull request #91 from sanderdw/reader-1.11.3

DSMR Reader 1.11.3
sanderdw · Apr 22, 2024 · b880e28 · b880e28
2 parents a7c76d0 + 34e5dc8
commit b880e28
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/dsmr_reader/Dockerfile b/dsmr_reader/Dockerfile
@@ -7,23 +7,19 @@ ENV LANG C.UTF-8
 
 RUN apk add --no-cache jq
 
-# Add bashio
 RUN \
-    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 \
-    \
-    && mv /tmp/bashio/lib /usr/lib/bashio \
+    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 \
-    && rm -f -r \
-        /tmp/*
+    \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /usr/src/*
 
 # HOMEASSISTANT Add-On OVERRIDES
 COPY rootfs /
-RUN chmod a+x /etc/cont-init.d/01-set-hassio-vars
+RUN chmod a+x /etc/s6-overlay/s6-rc.d/set-hassio-vars/run
 
 ENV DUID=0
 ENV DGID=0

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

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
@@ -0,0 +1 @@
+oneshot
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
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/set-hassio-vars/run
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