diff --git a/.github/workflows/dsmr-reader.yml b/.github/workflows/dsmr-reader.yml index 7e3bd10..e1b2447 100644 --- a/.github/workflows/dsmr-reader.yml +++ b/.github/workflows/dsmr-reader.yml @@ -6,7 +6,7 @@ on: push: branches: - 'master' - - 'reader-1.11.0' + - 'reader-1.11.1' tags: - '*.*.*' paths: @@ -23,58 +23,60 @@ jobs: # AMD64 - DOCKER_TAG_SUFFIX: amd64 S6_ARCH: amd64 - BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04 + BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01 PLATFORMS: linux/amd64 QEMU_ARCH: x86_64 # ARM32V6 - DOCKER_TAG_SUFFIX: armhf S6_ARCH: armhf - BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04 + BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01 PLATFORMS: linux/arm/v6 QEMU_ARCH: arm # ARM32V7 - DOCKER_TAG_SUFFIX: armv7 S6_ARCH: armv7 - BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04 + BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01 PLATFORMS: linux/arm/v7 QEMU_ARCH: arm # ARM64V8 - DOCKER_TAG_SUFFIX: aarch64 S6_ARCH: aarch64 - BASE_IMAGE: xirixiz/dsmr-reader-docker:5.11.0-2024.02.04 + BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01 PLATFORMS: linux/arm64/v8 QEMU_ARCH: aarch64 steps: # Get the repository's code - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 # https://github.com/docker/setup-qemu-action - name: Get the version from config.json id: data run: | version=$(jq --raw-output '.version' ./dsmr_reader/config.json) - echo "::set-output name=HA_RELEASE::$version" + echo "HA_RELEASE=$version" >> "$GITHUB_OUTPUT" - name: DSMR addon release - run: echo ${{ steps.data.outputs.HA_RELEASE }} + env: + HA_RELEASE: ${{ steps.data.outputs.HA_RELEASE }} + run: echo "$HA_RELEASE" - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 # https://github.com/docker/setup-buildx-action - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker meta id: meta # you'll use this in the next step - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: # list of Docker images to use as base name for tags images: | @@ -89,7 +91,7 @@ jobs: type=semver,pattern={{major}} type=raw,value=${{ steps.data.outputs.HA_RELEASE }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: ./dsmr_reader platforms: ${{ matrix.PLATFORMS }} diff --git a/dsmr_reader/CHANGELOG.md b/dsmr_reader/CHANGELOG.md index f454429..c93266d 100644 --- a/dsmr_reader/CHANGELOG.md +++ b/dsmr_reader/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 1.11.1 + +- Support for PostgreSQL 16.2 +- Technical: Bashio update to v0.16.2 +- Technical: Github Action workflow updated +- Technical: S6 Overlay v3 + ## 1.11.0 - Update to DSMR-reader v5.11 diff --git a/dsmr_reader/Dockerfile b/dsmr_reader/Dockerfile index 049af1b..15780e5 100644 --- 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/README.md b/dsmr_reader/README.md index 270b8a9..55059b7 100644 --- 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.0-purple.svg?style=flat-square +[addon-shield]: https://img.shields.io/badge/Addon%20Version-%201.11.1-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 index d5f8e74..d1df70e 100644 --- a/dsmr_reader/config.json +++ b/dsmr_reader/config.json @@ -1,6 +1,6 @@ { "name": "DSMR Reader", - "version": "1.11.0", + "version": "1.11.1", "slug": "dsmr_reader", "description": "Used for reading the smart meter DSMR P1 port (https://dsmr-reader.readthedocs.io)", "arch": ["armhf", "armv7", "aarch64", "amd64"], @@ -12,6 +12,7 @@ "ingress": true, "panel_icon": "mdi:leaf-circle-outline", "hassio_api": true, + "init": false, "map": ["backup:rw"], "ports": { "80/tcp": null 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 new file mode 100644 index 0000000..b48e63d --- /dev/null +++ b/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/init-docker-entrypoint/dependencies @@ -0,0 +1 @@ +set-hassio-vars diff --git a/dsmr_reader/rootfs/etc/cont-init.d/01-set-hassio-vars b/dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/set-hassio-vars/run similarity index 99% rename from dsmr_reader/rootfs/etc/cont-init.d/01-set-hassio-vars rename to dsmr_reader/rootfs/etc/s6-overlay/s6-rc.d/set-hassio-vars/run index d01ad75..ff4bc80 100644 --- a/dsmr_reader/rootfs/etc/cont-init.d/01-set-hassio-vars +++ b/dsmr_reader/rootfs/etc/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 new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ 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 new file mode 100644 index 0000000..65cd56c --- /dev/null +++ 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 \ No newline at end of file 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 new file mode 100644 index 0000000..e69de29