From 726ff220f171b5400dbf94d64ca17605bf68af43 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 14 Feb 2019 16:06:39 +0100
Subject: [PATCH] Update to 1.1.0 base image

---
 esphome-beta/config.json                         |  3 ++-
 esphome-dev/Dockerfile                           |  2 +-
 esphome-dev/build.json                           |  8 ++++----
 esphome-dev/config.json                          |  3 ++-
 esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh | 13 +++++++++++++
 esphome/config.json                              |  3 ++-
 6 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh

diff --git a/esphome-beta/config.json b/esphome-beta/config.json
index 3248edc..b6751c4 100644
--- a/esphome-beta/config.json
+++ b/esphome-beta/config.json
@@ -9,7 +9,8 @@
   "arch": [
     "amd64",
     "armhf",
-    "i386"
+    "i386",
+    "aarch64"
   ],
   "hassio_api": true,
   "auth_api": true,
diff --git a/esphome-dev/Dockerfile b/esphome-dev/Dockerfile
index b032083..a0f1237 100644
--- a/esphome-dev/Dockerfile
+++ b/esphome-dev/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.0.0
+ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.1.0
 FROM ${BUILD_FROM}
 
 RUN \
diff --git a/esphome-dev/build.json b/esphome-dev/build.json
index 9b974de..f9aecb1 100644
--- a/esphome-dev/build.json
+++ b/esphome-dev/build.json
@@ -1,10 +1,10 @@
 {
   "squash": false,
   "build_from": {
-    "aarch64": "esphome/esphome-hassio-base-aarch64:1.0.0",
-    "amd64": "esphome/esphome-hassio-base-amd64:1.0.0",
-    "armhf": "esphome/esphome-hassio-base-armhf:1.0.0",
-    "i386": "esphome/esphome-hassio-base-i386:1.0.0"
+    "aarch64": "esphome/esphome-hassio-base-aarch64:1.1.0",
+    "amd64": "esphome/esphome-hassio-base-amd64:1.1.0",
+    "armhf": "esphome/esphome-hassio-base-armhf:1.1.0",
+    "i386": "esphome/esphome-hassio-base-i386:1.1.0"
   },
   "args": {}
 }
diff --git a/esphome-dev/config.json b/esphome-dev/config.json
index 07e9df9..0a4df8d 100644
--- a/esphome-dev/config.json
+++ b/esphome-dev/config.json
@@ -9,7 +9,8 @@
   "arch": [
     "amd64",
     "armhf",
-    "i386"
+    "i386",
+    "aarch64"
   ],
   "hassio_api": true,
   "auth_api": true,
diff --git a/esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh b/esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh
new file mode 100644
index 0000000..600440f
--- /dev/null
+++ b/esphome-dev/rootfs/etc/cont-init.d/40-migrate.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# This files migrates the esphome config directory from the old path
+# ==============================================================================
+# shellcheck disable=SC1091
+source /usr/lib/hassio-addons/base.sh
+
+if [[ ! -d /config/esphome && -d /config/esphomeyaml ]]; then
+    echo "Moving config directory from /config/esphomeyaml to /config/esphome"
+    mv /config/esphomeyaml /config/esphome
+    mv /config/esphome/.esphomeyaml /config/esphome/.esphome
+fi
diff --git a/esphome/config.json b/esphome/config.json
index 39d4371..7b89ab2 100644
--- a/esphome/config.json
+++ b/esphome/config.json
@@ -9,7 +9,8 @@
   "arch": [
     "amd64",
     "armhf",
-    "i386"
+    "i386",
+    "aarch64"
   ],
   "hassio_api": true,
   "auth_api": true,