From 0422cba372ae41f6fdd817d469f9ba6b415b10d7 Mon Sep 17 00:00:00 2001
From: Apipa169 <44235469+Apipa169@users.noreply.github.com>
Date: Wed, 27 Nov 2019 11:16:10 +0100
Subject: [PATCH] Update to 6.3

This add-on is now using a new image. This makes the installation more stable and faster.

It also updates Assistant Relay to version 3.0.5
---
 assistant_relay/CHANGELOG.md      |  9 +++------
 assistant_relay/config.json       |  7 ++++---
 assistant_relay/dockerfile        | 21 +--------------------
 assistant_relay_beta/CHANGELOG.md | 19 ++++---------------
 assistant_relay_beta/config.json  |  4 ++--
 5 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/assistant_relay/CHANGELOG.md b/assistant_relay/CHANGELOG.md
index 4d96064..bee0846 100755
--- a/assistant_relay/CHANGELOG.md
+++ b/assistant_relay/CHANGELOG.md
@@ -1,7 +1,4 @@
-## 5.5
-Moving to a different base image to support armv7 (Raspberry Pi). 
+## 6.3
+This add-on is now using a new image. This makes the installation more stable and faster.
 
-## 5.4:
-This update changes the location of the audio responses which are showed in the webinterface. This fix the issue that they get lost after en restart or update.
-
-It is not required to do the setup again to keep using this addon, but to get the audio responses in the webinterface working you have to reinstall and reconfigure.
\ No newline at end of file
+It also updates Assistant Relay to version 3.0.5
\ No newline at end of file
diff --git a/assistant_relay/config.json b/assistant_relay/config.json
index a660919..6d4b9fb 100755
--- a/assistant_relay/config.json
+++ b/assistant_relay/config.json
@@ -1,9 +1,9 @@
 {
   "name": "Assistant Relay",
-  "version": "0.5.5",
+  "version": "0.6.3",
   "slug": "assistant_relay",
   "description": "Send (broadcast) commands to your Google Assistant via REST command",
-  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
+  "arch": ["amd64", "armv7"],
   "startup": "before",
   "url": "https://github.com/Apipa169/Assistant-Relay-for-Hassio",
   "boot": "auto",
@@ -13,5 +13,6 @@
   "schema": {},
   "ports": {
     "3000/tcp": 3000
-  }
+  },
+  "image": "apipa169/{arch}-hassio-assistant_relay"
 }
\ No newline at end of file
diff --git a/assistant_relay/dockerfile b/assistant_relay/dockerfile
index bfca693..dcdc05c 100755
--- a/assistant_relay/dockerfile
+++ b/assistant_relay/dockerfile
@@ -1,29 +1,10 @@
 ARG BUILD_FROM
-FROM node
+FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
 
-
-RUN mkdir /assistant_relay \
-&& npm i pm2 -g
-
 WORKDIR /assistant_relay
 
-RUN wget https://github.com/greghesp/assistant-relay/releases/download/v3.0.3/release.zip \
-&& unzip release.zip \
-&& rm release.zip \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/helpers/server.js \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/helpers/assistant.js \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/helpers/auth.js \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/routes/index.js \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/routes/server.js \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/bin/www \
-&& sed -i -e 's#./bin/config.json#/data/config.json#g' /assistant_relay/routes/server.js \
-&& sed -i -e 's#../bin/audio-responses/#/data/audio-responses/#g' /assistant_relay/helpers/server.js \
-&& sed -i -e 's#../bin/audio-responses/#/data/audio-responses/#g' /assistant_relay/routes/server.js \
-&& sed -i -e 's#bin/audio-responses/#/data/audio-responses/#g' /assistant_relay/helpers/server.js \
-&& npm i
-
 COPY run.sh /
 RUN chmod a+x /run.sh
 CMD [ "/run.sh" ]
\ No newline at end of file
diff --git a/assistant_relay_beta/CHANGELOG.md b/assistant_relay_beta/CHANGELOG.md
index cf7db06..5eac571 100755
--- a/assistant_relay_beta/CHANGELOG.md
+++ b/assistant_relay_beta/CHANGELOG.md
@@ -1,17 +1,6 @@
-## 5.7 
+## 6.3
+This add-on is now using a new image. This makes the installation more stable and faster.
 
-New image
+It also updates Assistant Relay to version 3.0.5
 
-## 5.6
-Update to Assistant Relay v3.0.4:
-
-- Bug fixed in Sandbox JSON creation
-- Fixed naming convention in Sandbox
-
-## 5.5
-Moving to a different base image to support armv7 (Raspberry Pi). 
-
-## 5.4:
-This update changes the location of the audio responses which are showed in the webinterface. This fix the issue that they get lost after en restart or update.
-
-It is not required to do the setup again to keep using this addon, but to get the audio responses in the webinterface working you have to reinstall and reconfigure.
\ No newline at end of file
+At the moment the beta is identical to the current release.
\ No newline at end of file
diff --git a/assistant_relay_beta/config.json b/assistant_relay_beta/config.json
index 1dcc1f8..a905dac 100755
--- a/assistant_relay_beta/config.json
+++ b/assistant_relay_beta/config.json
@@ -1,9 +1,9 @@
 {
   "name": "Assistant Relay BETA",
-  "version": "0.6",
+  "version": "0.6.3",
   "slug": "assistant_relay_beta",
   "description": "Send (broadcast) commands to your Google Assistant via REST command",
-  "arch": ["amd64"],
+  "arch": ["amd64", "armv7"],
   "startup": "before",
   "url": "https://github.com/Apipa169/Assistant-Relay-for-Hassio",
   "boot": "auto",