From 103860209951de0462f9a14298ef056b3e2e4cfb Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Wed, 24 Nov 2021 11:43:54 +0100
Subject: [PATCH] Update-deployment (#2281)

* Update deployment

* fix workflow

* Fix order

* restruct v1

* Fix style v2

* Cleanup style v3

* fix style v4

* Last style fix

* Address comments

* Update builder to 2021.11.3

* Fix let's encrypt

* fix lint

* Use ghcr.io

* fix

* Update versions

* fix readme
---
 tellstick/build.json  | 12 -----------
 tellstick/build.yaml  | 11 +++++++++++
 tellstick/config.json | 46 -------------------------------------------
 tellstick/config.yaml | 39 ++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 58 deletions(-)
 delete mode 100644 tellstick/build.json
 create mode 100644 tellstick/build.yaml
 delete mode 100644 tellstick/config.json
 create mode 100644 tellstick/config.yaml

diff --git a/tellstick/build.json b/tellstick/build.json
deleted file mode 100644
index 5d49c24..0000000
--- a/tellstick/build.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "build_from": {
-    "aarch64": "homeassistant/aarch64-base:3.13",
-    "amd64": "homeassistant/amd64-base:3.13",
-    "armhf": "homeassistant/armhf-base:3.13",
-    "armv7": "homeassistant/armv7-base:3.13",
-    "i386": "homeassistant/i386-base:3.13"
-  },
-  "args": {
-    "TELLDUS_COMMIT": "2598bbed16ffd701f2a07c99582f057a3decbaf3"
-  }
-}
diff --git a/tellstick/build.yaml b/tellstick/build.yaml
new file mode 100644
index 0000000..899803f
--- /dev/null
+++ b/tellstick/build.yaml
@@ -0,0 +1,11 @@
+build_from:
+  aarch64: ghcr.io/home-assistant/aarch64-base:3.13
+  amd64: ghcr.io/home-assistant/amd64-base:3.13
+  armhf: ghcr.io/home-assistant/armhf-base:3.13
+  armv7: ghcr.io/home-assistant/armv7-base:3.13
+  i386: ghcr.io/home-assistant/i386-base:3.13
+codenotary:
+  signer: notary@home-assistant.io
+  base_image: notary@home-assistant.io
+args:
+  TELLDUS_COMMIT: 2598bbed16ffd701f2a07c99582f057a3decbaf3
diff --git a/tellstick/config.json b/tellstick/config.json
deleted file mode 100644
index 1cdb736..0000000
--- a/tellstick/config.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "name": "TellStick",
-  "version": "2.1.0",
-  "slug": "tellstick",
-  "description": "TellStick and TellStick Duo service",
-  "url": "https://github.com/home-assistant/hassio-addons/tree/master/tellstick",
-  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
-  "startup": "system",
-  "stdin": true,
-  "usb": true,
-  "options": {
-    "devices": [
-      {
-        "id": 1,
-        "name": "Example device",
-        "protocol": "everflourish",
-        "model": "selflearning-switch",
-        "house": "A",
-        "unit": "1"
-      },
-      {
-        "id": 2,
-        "name": "Example device two",
-        "protocol": "everflourish",
-        "model": "selflearning-switch",
-        "house": "A",
-        "unit": "2"
-      }
-    ]
-  },
-  "schema": {
-    "devices": [
-      {
-        "id": "int(1,)",
-        "name": "str",
-        "protocol": "match(arctech|brateck|comen|everflourish|fineoffset|fuhaote|hasta|ikea|kangtai|mandolyn|oregon|risingsun|sartano|silvanchip|upm|waveman|x10|yidong)",
-        "model": "match(codeswitch|bell|selflearning-switch|selflearning-dimmer|selflearning|ecosavers|kp100|temperaturehumidity|temperature)?",
-        "house": "str?",
-        "code": "str?",
-        "unit": "str?",
-        "fade": "str?"
-      }
-    ]
-  },
-  "image": "homeassistant/{arch}-addon-tellstick"
-}
diff --git a/tellstick/config.yaml b/tellstick/config.yaml
new file mode 100644
index 0000000..29f5ad4
--- /dev/null
+++ b/tellstick/config.yaml
@@ -0,0 +1,39 @@
+version: 2.1.0
+slug: tellstick
+name: TellStick
+description: TellStick and TellStick Duo service
+url: https://github.com/home-assistant/hassio-addons/tree/master/tellstick
+arch:
+  - armhf
+  - armv7
+  - aarch64
+  - amd64
+  - i386
+image: homeassistant/{arch}-addon-tellstick
+options:
+  devices:
+    - house: A
+      id: 1
+      model: selflearning-switch
+      name: Example device
+      protocol: everflourish
+      unit: "1"
+    - house: A
+      id: 2
+      model: selflearning-switch
+      name: Example device two
+      protocol: everflourish
+      unit: "2"
+schema:
+  devices:
+    - code: str?
+      fade: str?
+      house: str?
+      id: int(1,)
+      model: match(codeswitch|bell|selflearning-switch|selflearning-dimmer|selflearning|ecosavers|kp100|temperaturehumidity|temperature)?
+      name: str
+      protocol: match(arctech|brateck|comen|everflourish|fineoffset|fuhaote|hasta|ikea|kangtai|mandolyn|oregon|risingsun|sartano|silvanchip|upm|waveman|x10|yidong)
+      unit: str?
+startup: system
+stdin: true
+usb: true