Merge pull request #88 from sanderdw/reader-1.11.2

Reader 1.11.2
sanderdw · Apr 17, 2024 · 088b233 · 088b233
2 parents 21198bd + 7dfc188
commit 088b233
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 20 deletions.
diff --git a/.github/workflows/dsmr-reader.yml b/.github/workflows/dsmr-reader.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
       - 'master'
-      - 'reader-1.11.1'
+      - 'reader-1.11.2'
     tags:
       - '*.*.*'
     paths:
@@ -23,28 +23,28 @@ jobs:
           # AMD64
           - DOCKER_TAG_SUFFIX: amd64
             S6_ARCH: amd64
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
+            BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04
             PLATFORMS: linux/amd64
             QEMU_ARCH: x86_64
 
           # ARM32V6
           - DOCKER_TAG_SUFFIX: armhf
             S6_ARCH: armhf
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
+            BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04
             PLATFORMS: linux/arm/v6
             QEMU_ARCH: arm
 
           # ARM32V7
           - DOCKER_TAG_SUFFIX: armv7
             S6_ARCH: armv7
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
+            BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04
             PLATFORMS: linux/arm/v7
             QEMU_ARCH: arm
 
           # ARM64V8
           - DOCKER_TAG_SUFFIX: aarch64
             S6_ARCH: aarch64
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
+            BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04
             PLATFORMS: linux/arm64/v8
             QEMU_ARCH: aarch64
 

diff --git a/dsmr_reader/CHANGELOG.md b/dsmr_reader/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.11.2
+
+- Some users are noticing stability issues so revert until [issue](https://https://github.com/sanderdw/hassio-addons/issues/86) is resolved
+
 ## 1.11.1
 
 - Support for PostgreSQL 16.2

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/README.md b/dsmr_reader/README.md
@@ -11,7 +11,7 @@ Credits to Dennis Siemensma for creating the DSMR Reader software (https://dsmr-
 ![DSMR Reader](https://github.com/sanderdw/hassio-addons/raw/master/images/dsmr_reader.png)
 
 [dsmr-shield]: https://img.shields.io/badge/DSMR%20Reader%20Version-%205.11-purple.svg?style=flat-square
-[addon-shield]: https://img.shields.io/badge/Addon%20Version-%201.11.1-purple.svg?style=flat-square
+[addon-shield]: https://img.shields.io/badge/Addon%20Version-%201.11.2-purple.svg?style=flat-square
 
 [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg?style=flat-square
 [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg?style=flat-square

diff --git a/dsmr_reader/config.json b/dsmr_reader/config.json
@@ -1,6 +1,6 @@
 {
   "name": "DSMR Reader",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "slug": "dsmr_reader",
   "description": "Used for reading the smart meter DSMR P1 port (https://dsmr-reader.readthedocs.io)",
   "arch": ["armhf", "armv7", "aarch64", "amd64"],
@@ -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