From f57dec5e6a48454cefd9ed5dc88c5872f3c5e051 Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Sat, 26 Aug 2023 21:16:53 -0400 Subject: [PATCH 1/5] Document what URL to use when adding #127 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ead222c1..a7e0766a 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ This is a collection of Home Assistant add-ons that work with [rtl_433](https://github.com/merbanan/rtl_433). * [How to add this add-on repository to your Home Assistant install](https://home-assistant.io/hassio/installing_third_party_addons/) +* Use `https://github.com/pbkhrv/rtl_433-hass-addons` as the URL for the repository. ## Running the Development Version From 594603dcfe4e6daf73a3fd43492fd49ea5cc05d3 Mon Sep 17 00:00:00 2001 From: Ben Klopfenstein Date: Thu, 26 Oct 2023 23:44:12 -0600 Subject: [PATCH 2/5] set the correct URL for the next autodiscovery image --- rtl_433_mqtt_autodiscovery-next/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtl_433_mqtt_autodiscovery-next/config.json b/rtl_433_mqtt_autodiscovery-next/config.json index ff14bd97..e235357b 100644 --- a/rtl_433_mqtt_autodiscovery-next/config.json +++ b/rtl_433_mqtt_autodiscovery-next/config.json @@ -1,6 +1,6 @@ { "name": "rtl_433 MQTT Auto Discovery (next)", - "image": "ghcr.io/pbkhrv/rtl_433-hass-addons-rtl_433_mqtt_autodiscovery-{arch}", + "image": "ghcr.io/pbkhrv/rtl_433-hass-addons-rtl_433_mqtt_autodiscovery-next-{arch}", "version": "next", "slug": "rtl433mqttautodiscovery-next", "description": "Automatic discovery of rtl_433 device information via MQTT", From 80a2bd4ffffa264ea30b012656577b65d0c77d0d Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Fri, 27 Oct 2023 09:04:53 -0400 Subject: [PATCH 3/5] Update CHANGELOG --- rtl_433_mqtt_autodiscovery/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rtl_433_mqtt_autodiscovery/CHANGELOG.md b/rtl_433_mqtt_autodiscovery/CHANGELOG.md index 75120430..de7e1055 100644 --- a/rtl_433_mqtt_autodiscovery/CHANGELOG.md +++ b/rtl_433_mqtt_autodiscovery/CHANGELOG.md @@ -1,3 +1,7 @@ +## [Unreleased] - YYYY-MM-DD + +* Fix pointing the next version of the addon to the stable version #164 + ## [0.6.0] - 2023-02-08 * Update rtl_433 to the 22.11 release. From 5e56f6358f2d1fcd7f0e8365c3e295c5b357296f Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Fri, 27 Oct 2023 09:23:48 -0400 Subject: [PATCH 4/5] Upstream images now only live on ghcr.io --- rtl_433_mqtt_autodiscovery-next/build.json | 10 +++++----- rtl_433_mqtt_autodiscovery/Dockerfile | 2 +- rtl_433_mqtt_autodiscovery/build.json | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rtl_433_mqtt_autodiscovery-next/build.json b/rtl_433_mqtt_autodiscovery-next/build.json index fac2a84c..d7090009 100644 --- a/rtl_433_mqtt_autodiscovery-next/build.json +++ b/rtl_433_mqtt_autodiscovery-next/build.json @@ -1,10 +1,10 @@ { "build_from": { - "aarch64": "homeassistant/aarch64-base-python:3.9-alpine3.16", - "amd64": "homeassistant/amd64-base-python:3.9-alpine3.16", - "armhf": "homeassistant/armhf-base-python:3.9-alpine3.16", - "armv7": "homeassistant/armv7-base-python:3.9-alpine3.16", - "i386": "homeassistant/i386-base-python:3.9-alpine3.16" + "aarch64": "ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.16", + "amd64": "ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.16", + "armhf": "ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.16", + "armv7": "ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.16", + "i386": "ghcr.io/home-assistant/i386-base-python:3.12-alpine3.16" }, "args": { "rtl433GitRevision": "master" diff --git a/rtl_433_mqtt_autodiscovery/Dockerfile b/rtl_433_mqtt_autodiscovery/Dockerfile index b1631d84..1e9ed2da 100644 --- a/rtl_433_mqtt_autodiscovery/Dockerfile +++ b/rtl_433_mqtt_autodiscovery/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=homeassistant/amd64-base-python:3.9-alpine3.16 +ARG BUILD_FROM=ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.16 FROM ${BUILD_FROM} as builder ARG rtl433GitRevision=22.11 diff --git a/rtl_433_mqtt_autodiscovery/build.json b/rtl_433_mqtt_autodiscovery/build.json index a7758a85..1b7379d1 100644 --- a/rtl_433_mqtt_autodiscovery/build.json +++ b/rtl_433_mqtt_autodiscovery/build.json @@ -1,9 +1,9 @@ { "build_from": { - "aarch64": "homeassistant/aarch64-base-python:3.9-alpine3.16", - "amd64": "homeassistant/amd64-base-python:3.9-alpine3.16", - "armhf": "homeassistant/armhf-base-python:3.9-alpine3.16", - "armv7": "homeassistant/armv7-base-python:3.9-alpine3.16", - "i386": "homeassistant/i386-base-python:3.9-alpine3.16" + "aarch64": "ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.16", + "amd64": "ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.16", + "armhf": "ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.16", + "armv7": "ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.16", + "i386": "ghcr.io/home-assistant/i386-base-python:3.12-alpine3.16" } } From d3ff4de7f0ec8b12890eaa7233afaf068a5ed5e1 Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Fri, 27 Oct 2023 09:25:24 -0400 Subject: [PATCH 5/5] Revert "Upstream images now only live on ghcr.io" This reverts commit 5e56f6358f2d1fcd7f0e8365c3e295c5b357296f. --- rtl_433_mqtt_autodiscovery-next/build.json | 10 +++++----- rtl_433_mqtt_autodiscovery/Dockerfile | 2 +- rtl_433_mqtt_autodiscovery/build.json | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rtl_433_mqtt_autodiscovery-next/build.json b/rtl_433_mqtt_autodiscovery-next/build.json index d7090009..fac2a84c 100644 --- a/rtl_433_mqtt_autodiscovery-next/build.json +++ b/rtl_433_mqtt_autodiscovery-next/build.json @@ -1,10 +1,10 @@ { "build_from": { - "aarch64": "ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.16", - "amd64": "ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.16", - "armhf": "ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.16", - "armv7": "ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.16", - "i386": "ghcr.io/home-assistant/i386-base-python:3.12-alpine3.16" + "aarch64": "homeassistant/aarch64-base-python:3.9-alpine3.16", + "amd64": "homeassistant/amd64-base-python:3.9-alpine3.16", + "armhf": "homeassistant/armhf-base-python:3.9-alpine3.16", + "armv7": "homeassistant/armv7-base-python:3.9-alpine3.16", + "i386": "homeassistant/i386-base-python:3.9-alpine3.16" }, "args": { "rtl433GitRevision": "master" diff --git a/rtl_433_mqtt_autodiscovery/Dockerfile b/rtl_433_mqtt_autodiscovery/Dockerfile index 1e9ed2da..b1631d84 100644 --- a/rtl_433_mqtt_autodiscovery/Dockerfile +++ b/rtl_433_mqtt_autodiscovery/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.16 +ARG BUILD_FROM=homeassistant/amd64-base-python:3.9-alpine3.16 FROM ${BUILD_FROM} as builder ARG rtl433GitRevision=22.11 diff --git a/rtl_433_mqtt_autodiscovery/build.json b/rtl_433_mqtt_autodiscovery/build.json index 1b7379d1..a7758a85 100644 --- a/rtl_433_mqtt_autodiscovery/build.json +++ b/rtl_433_mqtt_autodiscovery/build.json @@ -1,9 +1,9 @@ { "build_from": { - "aarch64": "ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.16", - "amd64": "ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.16", - "armhf": "ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.16", - "armv7": "ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.16", - "i386": "ghcr.io/home-assistant/i386-base-python:3.12-alpine3.16" + "aarch64": "homeassistant/aarch64-base-python:3.9-alpine3.16", + "amd64": "homeassistant/amd64-base-python:3.9-alpine3.16", + "armhf": "homeassistant/armhf-base-python:3.9-alpine3.16", + "armv7": "homeassistant/armv7-base-python:3.9-alpine3.16", + "i386": "homeassistant/i386-base-python:3.9-alpine3.16" } }