From 3b9f9e0bae877993988b7fa1c0bce4778e372bb0 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 8 Nov 2019 09:31:23 +0100
Subject: [PATCH] Update Almond + Ada (#822)

---
 ada/CHANGELOG.md    |  4 ++++
 ada/build.json      |  2 +-
 ada/config.json     |  2 +-
 almond/CHANGELOG.md | 18 ++++++++++++++++++
 almond/Dockerfile   |  5 ++---
 almond/build.json   |  2 +-
 almond/config.json  |  2 +-
 7 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 almond/CHANGELOG.md

diff --git a/ada/CHANGELOG.md b/ada/CHANGELOG.md
index d8e3a3c..a869e48 100644
--- a/ada/CHANGELOG.md
+++ b/ada/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3
+
+- Update Ada to 0.4
+
 ## 0.2
 
 - Update Ada to 0.3
diff --git a/ada/build.json b/ada/build.json
index 2ee062b..7ed0ca9 100644
--- a/ada/build.json
+++ b/ada/build.json
@@ -5,6 +5,6 @@
     "armhf": "homeassistant/armhf-base-debian:buster"
   },
   "args": {
-    "ADA_VERSION": "0.3"
+    "ADA_VERSION": "0.4"
   }
 }
diff --git a/ada/config.json b/ada/config.json
index 2a38b7e..c79e0f8 100644
--- a/ada/config.json
+++ b/ada/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Hey Ada!",
-  "version": "0.2",
+  "version": "0.3",
   "slug": "ada",
   "description": "Home Assistant featured voice assist",
   "url": "https://home-assistant.io/addons/ada/",
diff --git a/almond/CHANGELOG.md b/almond/CHANGELOG.md
new file mode 100644
index 0000000..59f1876
--- /dev/null
+++ b/almond/CHANGELOG.md
@@ -0,0 +1,18 @@
+# Changelog
+
+## 0.4
+
+- Update Almond to 1.7.0
+
+## 0.3
+
+- Add automatic Almond setup
+
+## 0.2
+
+- Add Ingress
+- Update almond to 1.6.0
+
+## 0.1
+
+- Initial version
\ No newline at end of file
diff --git a/almond/Dockerfile b/almond/Dockerfile
index 5988704..fdf49c4 100644
--- a/almond/Dockerfile
+++ b/almond/Dockerfile
@@ -20,15 +20,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 
 # Install Almond
-ARG ALMOND_COMMIT
+ARG ALMOND_VERSION
 WORKDIR /opt/almond
 RUN apt-get update && apt-get install -y --no-install-recommends \
         git \
         python-dev \
         build-essential \
     \
-    && git clone https://github.com/stanford-oval/almond-server . \
-    && git checkout ${ALMOND_COMMIT} \
+    && git clone -b ${ALMOND_VERSION} --depth 1 https://github.com/stanford-oval/almond-server . \
     && rm -fr .git \
     && yarn \
     \
diff --git a/almond/build.json b/almond/build.json
index 6c82ce6..fa44452 100644
--- a/almond/build.json
+++ b/almond/build.json
@@ -5,6 +5,6 @@
     "aarch64": "homeassistant/aarch64-base-debian:buster"
   },
   "args": {
-    "ALMOND_COMMIT": "87d37637c8bcaea8a86d2e1eba039184d4434049"
+    "ALMOND_VERSION": "v1.7.0"
   }
 }
diff --git a/almond/config.json b/almond/config.json
index cee010d..af31bb8 100644
--- a/almond/config.json
+++ b/almond/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Almond",
-  "version": "0.3",
+  "version": "0.4",
   "slug": "almond",
   "description": "The home server version of Almond",
   "url": "https://home-assistant.io/addons/almond/",