From 0a6b46fe4d041edf08d42ae8aa06a95920c66e50 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Dec 2019 13:56:05 +0100
Subject: [PATCH] dhcp_server: Collection of styling changes (#898)

* dhcp_server: Prettier JSON & YAML files

* dhcp_server: Move run.sh into data folder

* dhcp_server: Pin base images
---
 dhcp_server/Dockerfile          |  2 +-
 dhcp_server/azure-pipelines.yml | 15 +++++++--------
 dhcp_server/build.json          |  9 +++++++++
 dhcp_server/config.json         | 17 +++--------------
 dhcp_server/{ => data}/run.sh   |  0
 5 files changed, 20 insertions(+), 23 deletions(-)
 create mode 100644 dhcp_server/build.json
 rename dhcp_server/{ => data}/run.sh (100%)

diff --git a/dhcp_server/Dockerfile b/dhcp_server/Dockerfile
index 2a80216..c7fb74d 100644
--- a/dhcp_server/Dockerfile
+++ b/dhcp_server/Dockerfile
@@ -8,6 +8,6 @@ ENV LANG C.UTF-8
 RUN apk add --no-cache dhcp
 
 # Copy data
-COPY run.sh /
+COPY data/run.sh /
 
 CMD [ "/run.sh" ]
diff --git a/dhcp_server/azure-pipelines.yml b/dhcp_server/azure-pipelines.yml
index 1526ad0..5e8d242 100644
--- a/dhcp_server/azure-pipelines.yml
+++ b/dhcp_server/azure-pipelines.yml
@@ -3,20 +3,19 @@
 trigger:
   branches:
     include:
-    - master
+      - master
   paths:
     include:
-    - dhcp_server/*
+      - dhcp_server/*
 pr: none
 
 variables:
   - name: versionBuilder
-    value: '2.0'
+    value: "2.0"
   - group: docker
 
-
 jobs:
-- template: /.azure/azp-template-addon.yml
-  parameters:
-    addon: 'dhcp_server'
-    arch: '--all'
+  - template: /.azure/azp-template-addon.yml
+    parameters:
+      addon: "dhcp_server"
+      arch: "--all"
diff --git a/dhcp_server/build.json b/dhcp_server/build.json
new file mode 100644
index 0000000..bbf7ade
--- /dev/null
+++ b/dhcp_server/build.json
@@ -0,0 +1,9 @@
+{
+  "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"
+  }
+}
diff --git a/dhcp_server/config.json b/dhcp_server/config.json
index 11542fa..858da84 100644
--- a/dhcp_server/config.json
+++ b/dhcp_server/config.json
@@ -4,13 +4,7 @@
   "slug": "dhcp_server",
   "description": "A simple DHCP server",
   "url": "https://home-assistant.io/addons/dhcp_server/",
-  "arch": [
-    "armhf",
-    "armv7",
-    "aarch64",
-    "amd64",
-    "i386"
-  ],
+  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
   "startup": "system",
   "boot": "auto",
   "host_network": true,
@@ -18,10 +12,7 @@
     "default_lease": 86400,
     "max_lease": 172800,
     "domain": null,
-    "dns": [
-      "8.8.8.8",
-      "8.8.4.4"
-    ],
+    "dns": ["8.8.8.8", "8.8.4.4"],
     "networks": [
       {
         "subnet": "192.168.1.0",
@@ -39,9 +30,7 @@
     "default_lease": "int",
     "max_lease": "int",
     "domain": "str",
-    "dns": [
-      "str"
-    ],
+    "dns": ["str"],
     "networks": [
       {
         "subnet": "str",
diff --git a/dhcp_server/run.sh b/dhcp_server/data/run.sh
similarity index 100%
rename from dhcp_server/run.sh
rename to dhcp_server/data/run.sh