update: based on new addon example

.devcontainer.json

@@ -7,18 +7,22 @@
   "containerEnv": {
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
-  "extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"],
-  "mounts": ["type=volume,target=/var/lib/docker"],
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh": {
-        "path": "/usr/bin/zsh"
+  "customizations": {
+    "vscode": {
+      "extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "/usr/bin/zsh"
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh",
+        "editor.formatOnPaste": false,
+        "editor.formatOnSave": true,
+        "editor.formatOnType": true,
+        "files.trimTrailingWhitespace": true
       }
-    },
-    "terminal.integrated.defaultProfile.linux": "zsh",
-    "editor.formatOnPaste": false,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true,
-    "files.trimTrailingWhitespace": true
-  }
+    }
+  },
+  "mounts": ["type=volume,target=/var/lib/docker"]
 }

.github/CODEOWNERS

@@ -0,0 +1 @@
+.github/* @minims

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+github: minims
+custom: https://www.buymeacoffee.com/minims

.github/renovate.json

@@ -0,0 +1,62 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "rebaseWhen": "behind-base-branch",
+    "dependencyDashboard": true,
+    "labels": [
+        "dependencies",
+        "no-stale"
+    ],
+    "commitMessagePrefix": "⬆️",
+    "commitMessageTopic": "{{depName}}",
+    "regexManagers": [
+        {
+            "fileMatch": [
+                "/Dockerfile$",
+                "/build.yaml$"
+            ],
+            "matchStringsStrategy": "any",
+            "matchStrings": [
+                "ARG BUILD_FROM=(?<depName>.*?):(?<currentValue>.*?)\\s+",
+                "(aarch64|amd64|armv7):\\s[\"']?(?<depName>.*?):(?<currentValue>.*?)[\"']?\\s"
+            ],
+            "datasourceTemplate": "docker"
+        },
+        {
+            "fileMatch": [
+                "/Dockerfile$"
+            ],
+            "matchStringsStrategy": "any",
+            "matchStrings": [
+                "\\s\\s(?<package>[a-z0-9-]+)=(?<currentValue>[a-z0-9-_.]+)\\s+"
+            ],
+            "versioningTemplate": "loose",
+            "datasourceTemplate": "repology",
+            "depNameTemplate": "alpine_3_21/{{package}}"
+        }
+    ],
+    "packageRules": [
+        {
+            "matchDatasources": [
+                "repology"
+            ],
+            "automerge": true
+        },
+        {
+            "groupName": "Add-on base image",
+            "matchDatasources": [
+                "docker"
+            ]
+        },
+        {
+            "groupName": "Add-on base image",
+            "matchDatasources": [
+                "docker"
+            ],
+            "matchUpdateTypes": [
+                "minor",
+                "patch"
+            ],
+            "automerge": true
+        }
+    ]
+}

.github/workflows/deploy.yaml

@@ -16,5 +16,4 @@ jobs:
   workflows:
     uses: hassio-addons/workflows/.github/workflows/addon-deploy.yaml@main
     secrets:
-      CAS_API_KEY: ${{ secrets.CAS_API_KEY }}
       DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}

MyFox2MQTT-dev/Dockerfile

@@ -1,6 +1,7 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 ARG BUILD_FROM
 FROM $BUILD_FROM
+FROM $BUILD_FROM$:dev
 ENV LANG C.UTF-8
 
 # Install required packages
@@ -9,7 +10,7 @@ RUN pip3 install --no-cache-dir python-json2yaml==0.1.1
 
 # Download source and untar
 WORKDIR /usr/bin
-ADD "https://github.com/Minims/MyFox2MQTT/archive/refs/heads/dev.tar.gz" dev.tar.gz
+COPY "https://github.com/Minims/MyFox2MQTT/archive/refs/heads/dev.tar.gz" dev.tar.gz
 RUN tar -xvf dev.tar.gz
 RUN mv /usr/bin/MyFox2MQTT-dev /usr/bin/MyFox2MQTT
 
@@ -18,4 +19,4 @@ WORKDIR /usr/bin/MyFox2MQTT/myFox2Mqtt
 RUN pip3 install --no-cache-dir -r requirements.txt
 
 # Copy root filesystem
-ADD rootfs /
+COPY rootfs /

MyFox2MQTT-dev/translations/en.yaml

@@ -1,3 +1,4 @@
+---
 configuration:
   message:
     name: Message

MyFox2MQTT/Dockerfile

@@ -1,18 +1,16 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
+ARG VERSION=2024.9.2
 ARG BUILD_FROM
-FROM $BUILD_FROM
+FROM $BUILD_FROM:{$VERSION}
 ENV LANG C.UTF-8
 
-# MyFox2MQTT version
-ARG VERSION=2024.9.2
-
 # Install required packages
 RUN apk add --no-cache py3-pip
 RUN pip3 install --no-cache-dir python-json2yaml==0.1.1
 
 # Download source and untar
 WORKDIR /usr/bin
-ADD "https://github.com/Minims/MyFox2MQTT/archive/refs/tags/${VERSION}.tar.gz" ${VERSION}.tar.gz
+COPY "https://github.com/Minims/MyFox2MQTT/archive/refs/tags/${VERSION}.tar.gz" ${VERSION}.tar.gz
 RUN tar -xvf ${VERSION}.tar.gz
 RUN mv /usr/bin/MyFox2MQTT-${VERSION} /usr/bin/MyFox2MQTT
 
@@ -21,4 +19,4 @@ WORKDIR /usr/bin/MyFox2MQTT/myFox2Mqtt
 RUN pip3 install --no-cache-dir -r requirements.txt
 
 # Copy root filesystem
-ADD rootfs /
+COPY rootfs /

MyFox2MQTT/translations/en.yaml

@@ -1,3 +1,4 @@
+---
 configuration:
   message:
     name: Message

README.md

@@ -1,3 +1,5 @@
+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/minims)
+
 # Minims Home Assistant add-on repository
 
 [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2FMinims%2Fhomeassistant-addons)

SomfyProtect2MQTT-dev/Dockerfile

@@ -1,21 +1,40 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 ARG BUILD_FROM
-FROM $BUILD_FROM
+FROM ${BUILD_FROM}:dev
 ENV LANG C.UTF-8
 
-# Install required packages
-RUN apk add --no-cache py3-pip py3-opencv ffmpeg
-RUN pip3 install --no-cache-dir python-json2yaml==0.1.1
+# Copy root filesystem
+COPY rootfs /
+
+# Setup base
+RUN apk add --no-cache \
+    build-base \
+    ffmpeg \
+    ffmpeg-dev \
+    libjxl \
+    libjxl-tools \
+    libsrtp \
+    libsrtp-dev \
+    libvpx \
+    libvpx-dev \
+    openssl \
+    openssl-dev \
+    opus \
+    opus-dev \
+    py3-opencv \
+    py3-pip \
+    python3 \
+    python3-dev \
+    yq
+
+# Install python3 requirements
+# RUN pip3 install --no-cache-dir python-json2yaml==0.1.1
 
 # Download source and untar
 WORKDIR /usr/bin
-ADD "https://github.com/Minims/SomfyProtect2MQTT/archive/refs/heads/dev.tar.gz" dev.tar.gz
-RUN tar -xvf dev.tar.gz
-RUN mv /usr/bin/SomfyProtect2MQTT-dev /usr/bin/SomfyProtect2MQTT
+COPY "https://github.com/Minims/SomfyProtect2MQTT/archive/refs/heads/dev.tar.gz" dev.tar.gz
+RUN tar -xvf dev.tar.gz && mv /usr/bin/SomfyProtect2MQTT-dev /usr/bin/SomfyProtect2MQTT
 
 # Install python3 requirements
 WORKDIR /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt
 RUN pip3 install --no-cache-dir -r requirements/addon.txt
-
-# Copy root filesystem
-ADD rootfs /

SomfyProtect2MQTT-dev/build.yaml

@@ -1,14 +1,15 @@
+---
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 build_from:
-  aarch64: ghcr.io/hassio-addons/base:15.0.5
-  amd64: ghcr.io/hassio-addons/base:15.0.5
-  armhf: ghcr.io/hassio-addons/base:15.0.5
-  armv7: ghcr.io/hassio-addons/base:15.0.5
-  i386: ghcr.io/hassio-addons/base:15.0.5
+  aarch64: ghcr.io/hassio-addons/base:17.1.0
+  amd64: ghcr.io/hassio-addons/base:17.1.0
+  armhf: ghcr.io/hassio-addons/base:17.1.0
+  armv7: ghcr.io/hassio-addons/base:17.1.0
+  i386: ghcr.io/hassio-addons/base:17.1.0
 labels:
   org.opencontainers.image.title: "Home Assistant Add-on: Minims add-on"
   org.opencontainers.image.description: "Minims add-on to use as a blueprint for new add-ons."
   org.opencontainers.image.source: "https://github.com/Minims/homeassistant-addons"
   org.opencontainers.image.licenses: "Apache License 2.0"
 args:
-  VERSION: "2024.9.0"
+  VERSION: "2025.2.0a"

SomfyProtect2MQTT-dev/config.yaml

@@ -1,5 +1,5 @@
-# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 ---
+# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: SomfyProtect2MQTT-dev
 version: dev
 slug: somfy-protect-2-mqtt-dev
@@ -18,7 +18,7 @@ arch:
 init: false
 map:
   - share:rw
-  - config:rw
+  - homeassistant_config:rw
 options:
   somfy_protect:
     username: mail@example.org

SomfyProtect2MQTT-dev/rootfs/etc/s6-overlay/s6-rc.d/SomfyProtect2MQTT/finish

@@ -0,0 +1,45 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant SomfyProtect2MQTT Add-on for Home Assistant
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="somfyProtect2Mqtt"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+# Received a signal
+if [[ "${exit_code_service}" -eq 256 ]]; then
+
+  # The signal might be a result of another service crashing. Only
+  # overwrite the container exit code if it is not already set.
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+
+  # If the signal is SIGTERM, we should halt the container and take down
+  # the whole  process tree.
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+
+# The service exited with a non-zero exit code, which means it crashed.
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+
+  # The service might be a result of another service crashing. Only
+  # overwrite the container exit code if it is not already set.
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+
+  # We should halt the container and take down the whole process tree.
+  exec /run/s6/basedir/bin/halt
+
+# The service exited with a zero exit code, which means it exited, let
+# S6 supervision restart it.
+else
+  bashio::log.info "Service ${service} restarting..."
+fi

SomfyProtect2MQTT-dev/rootfs/etc/services.d/SomfyProtect2MQTT/run → SomfyProtect2MQTT-dev/rootfs/etc/s6-overlay/s6-rc.d/SomfyProtect2MQTT/run

@@ -1,17 +1,14 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
-# Start the example service
-# s6-overlay docs: https://github.com/just-containers/s6-overlay
+# Home Assistant Community Add-on: SomfyProtect2MQTT
+# Runs SomfyProtect2MQTT
 # ==============================================================================
 
-# Add your code here
-
-#!/usr/bin/env bashio
-
 bashio::log.info "Generating config.yaml from options.json"
 echo '# Generated by homeassistant, do not edit!' > /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml.tmp
 echo '# Edit configuration only at the Add-on configuration tab!' >> /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml.tmp
-json2yaml /data/options.json >> /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml.tmp
+yq -P -oy /data/options.json >> /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml.tmp
 sed 's/  -/    -/'  /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml.tmp > /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml
 bashio::log.info "Configuration :"
 bashio::log.info "$(cat /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt/config/config.yaml)"

SomfyProtect2MQTT-dev/rootfs/etc/s6-overlay/s6-rc.d/SomfyProtect2MQTT/type

@@ -0,0 +1 @@
+longrun

SomfyProtect2MQTT-dev/translations/en.yaml

@@ -1,4 +1,5 @@
+---
 configuration:
   message:
     name: Message
-    description: The message that will be printed to the log when starting this example add-on.
+    description: The message that will be printed to the log when starting this  add-on.

SomfyProtect2MQTT/Dockerfile

@@ -1,18 +1,16 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
+ARG VERSION=2024.9.0
 ARG BUILD_FROM
-FROM $BUILD_FROM
+FROM $BUILD_FROM$:${VERSION}
 ENV LANG C.UTF-8
 
-# SomfyProtect2MQTT version
-ARG VERSION=2024.9.0
-
 # Install required packages
 RUN apk add --no-cache py3-pip py3-opencv ffmpeg
 RUN pip3 install --no-cache-dir python-json2yaml==0.1.1
 
 # Download source and untar
 WORKDIR /usr/bin
-ADD "https://github.com/Minims/SomfyProtect2MQTT/archive/refs/tags/${VERSION}.tar.gz" ${VERSION}.tar.gz
+COPY "https://github.com/Minims/SomfyProtect2MQTT/archive/refs/tags/${VERSION}.tar.gz" ${VERSION}.tar.gz
 RUN tar -xvf ${VERSION}.tar.gz
 RUN mv /usr/bin/SomfyProtect2MQTT-${VERSION} /usr/bin/SomfyProtect2MQTT
 
@@ -21,4 +19,4 @@ WORKDIR /usr/bin/SomfyProtect2MQTT/somfyProtect2Mqtt
 RUN pip3 install --no-cache-dir -r requirements/addon.txt
 
 # Copy root filesystem
-ADD rootfs /
+COPY rootfs /

SomfyProtect2MQTT/build.yaml

@@ -1,3 +1,4 @@
+---
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
 build_from:
   aarch64: ghcr.io/hassio-addons/base:15.0.5