From 646857b305a74fd3035f2003d5e924b91ef4a649 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Dec 2019 13:53:16 +0100
Subject: [PATCH] cec_scan: Collection of styling improvements (#894)

* cec_scan: Prettier YAML & JSON files

* cec_scan: Pin base images

* cec_scan: Move data files to data folder

* cec_scan: Fix Markdownlint issue in changelog
---
 cec_scan/CHANGELOG.md        |  3 +++
 cec_scan/Dockerfile          |  2 +-
 cec_scan/azure-pipelines.yml | 15 +++++++--------
 cec_scan/build.json          |  7 +++++++
 cec_scan/config.json         | 12 ++----------
 cec_scan/{ => data}/run.sh   |  0
 6 files changed, 20 insertions(+), 19 deletions(-)
 rename cec_scan/{ => data}/run.sh (100%)

diff --git a/cec_scan/CHANGELOG.md b/cec_scan/CHANGELOG.md
index 8970937..3aed67b 100644
--- a/cec_scan/CHANGELOG.md
+++ b/cec_scan/CHANGELOG.md
@@ -1,13 +1,16 @@
 # Changelog
 
 ## 2.1
+
 - Added README into the add-on repository
 - Reduced size of add-on image for armhf & aarch64
 - Improved support for armv7
 
 ## 2.0
+
 - Use new native Alpine RPi library for 64bit
 
 ## 1.0
+
 - Add support for Raspberry-pi 64bit
 - Update libCEC to 4.0.3
diff --git a/cec_scan/Dockerfile b/cec_scan/Dockerfile
index f649b37..4372d91 100644
--- a/cec_scan/Dockerfile
+++ b/cec_scan/Dockerfile
@@ -45,7 +45,7 @@ RUN \
 ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH}
 
 # Copy data
-COPY run.sh /
+COPY data/run.sh /
 
 WORKDIR /
 CMD [ "/run.sh" ]
diff --git a/cec_scan/azure-pipelines.yml b/cec_scan/azure-pipelines.yml
index b10c829..c62f407 100644
--- a/cec_scan/azure-pipelines.yml
+++ b/cec_scan/azure-pipelines.yml
@@ -3,20 +3,19 @@
 trigger:
   branches:
     include:
-    - master
+      - master
   paths:
     include:
-    - cec_scan/*
+      - cec_scan/*
 pr: none
 
 variables:
   - name: versionBuilder
-    value: '2.0'
+    value: "2.0"
   - group: docker
 
-
 jobs:
-- template: /.azure/azp-template-addon.yml
-  parameters:
-    addon: 'cec_scan'
-    arch: '--all'
+  - template: /.azure/azp-template-addon.yml
+    parameters:
+      addon: "cec_scan"
+      arch: "--all"
diff --git a/cec_scan/build.json b/cec_scan/build.json
index e9dacf0..a8e6139 100644
--- a/cec_scan/build.json
+++ b/cec_scan/build.json
@@ -1,4 +1,11 @@
 {
+  "build_from": {
+    "aarch64": "homeassistant/aarch64-base:3.10",
+    "amd64": "homeassistant/amd64-base:3.10",
+    "armhf": "homeassistant/armhf-base:3.10",
+    "armv7": "homeassistant/armv7-base:3.10",
+    "i386": "homeassistant/i386-base:3.10"
+  },
   "args": {
     "LIBCEC_VERSION": "4.0.3"
   }
diff --git a/cec_scan/config.json b/cec_scan/config.json
index f1585f8..07df1b1 100644
--- a/cec_scan/config.json
+++ b/cec_scan/config.json
@@ -4,18 +4,10 @@
   "slug": "cec_scan",
   "description": "Scan for HDMI CEC devices",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/cec_scan",
-  "arch": [
-    "armhf",
-    "armv7",
-    "aarch64",
-    "amd64",
-    "i386"
-  ],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "once",
   "boot": "manual",
-  "devices": [
-    "/dev/vchiq:/dev/vchiq:rwm"
-  ],
+  "devices": ["/dev/vchiq:/dev/vchiq:rwm"],
   "options": {},
   "schema": {},
   "image": "homeassistant/{arch}-addon-cec_scan"
diff --git a/cec_scan/run.sh b/cec_scan/data/run.sh
similarity index 100%
rename from cec_scan/run.sh
rename to cec_scan/data/run.sh