From 531d6408d69878df72a2f2fb5c9eb628ceb73b04 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 17 Dec 2019 14:51:17 +0100 Subject: [PATCH 1/4] almond: Change link in add-on --- almond/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/almond/config.json b/almond/config.json index 647a85e..e4ed22e 100644 --- a/almond/config.json +++ b/almond/config.json @@ -3,7 +3,7 @@ "version": "0.7", "slug": "almond", "description": "The home server version of Almond", - "url": "https://home-assistant.io/addons/almond/", + "url": "https://github.com/home-assistant/hassio-addons/blob/master/almond", "arch": ["armv7", "aarch64", "amd64"], "startup": "application", "boot": "auto", From 22115317c05e0d608a9ad89d7dbe500791f884e8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 17 Dec 2019 14:52:08 +0100 Subject: [PATCH 2/4] almond: Format files with Prettier --- almond/azure-pipelines.yml | 15 +++++++-------- almond/config.json | 6 ++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/almond/azure-pipelines.yml b/almond/azure-pipelines.yml index 04d82f7..f69bdc7 100644 --- a/almond/azure-pipelines.yml +++ b/almond/azure-pipelines.yml @@ -3,20 +3,19 @@ trigger: branches: include: - - master + - master paths: include: - - almond/* + - almond/* pr: none variables: - name: versionBuilder - value: '2.0' + value: "2.0" - group: docker - jobs: -- template: /.azure/azp-template-addon.yml - parameters: - addon: 'almond' - arch: '--amd64 --armv7 --aarch64' + - template: /.azure/azp-template-addon.yml + parameters: + addon: "almond" + arch: "--amd64 --armv7 --aarch64" diff --git a/almond/config.json b/almond/config.json index e4ed22e..db5b72d 100644 --- a/almond/config.json +++ b/almond/config.json @@ -12,9 +12,7 @@ "panel_icon": "mdi:comment-eye-outline", "homeassistant": "0.102.0.dev", "homeassistant_api": true, - "options": { - }, - "schema": { - }, + "options": {}, + "schema": {}, "image": "homeassistant/{arch}-addon-almond" } From 1ddf1bba0581a7cb2b4cd92780ec5472340d4209 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 17 Dec 2019 14:52:26 +0100 Subject: [PATCH 3/4] almond: Code styling Dockerfile --- almond/Dockerfile | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/almond/Dockerfile b/almond/Dockerfile index fdf49c4..991924b 100644 --- a/almond/Dockerfile +++ b/almond/Dockerfile @@ -2,16 +2,21 @@ ARG BUILD_FROM FROM ${BUILD_FROM} # Install Alomond requirements -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ software-properties-common \ gnupg \ nginx \ unzip \ \ - && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_12.x buster main" > /etc/apt/sources.list.d/nodesource.list \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key \ + | apt-key add - \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg \ + | apt-key add - \ + && echo "deb https://deb.nodesource.com/node_12.x buster main" \ + > /etc/apt/sources.list.d/nodesource.list \ + && echo "deb https://dl.yarnpkg.com/debian/ stable main" \ + > /etc/apt/sources.list.d/yarn.list \ \ && apt-get update && apt-get install -y --no-install-recommends \ nodejs \ @@ -22,12 +27,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Install Almond ARG ALMOND_VERSION WORKDIR /opt/almond -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ git \ python-dev \ build-essential \ \ - && git clone -b ${ALMOND_VERSION} --depth 1 https://github.com/stanford-oval/almond-server . \ + && git clone -b "${ALMOND_VERSION}" --depth 1 \ + "https://github.com/stanford-oval/almond-server" . \ && rm -fr .git \ && yarn \ \ @@ -35,8 +42,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git \ python-dev \ build-essential \ - && rm -rf /var/lib/apt/lists/* \ - && rm -fr /root/.cache + && rm -rf \ + /var/lib/apt/lists/* \ + /root/.cache # Base env settings ENV LANG=en_US.utf8 From 39e2d3d1c66605daae0cfe66eeb2f27f9f2e4ab8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 17 Dec 2019 14:52:49 +0100 Subject: [PATCH 4/4] almond: Small improvements to the documentation --- almond/README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/almond/README.md b/almond/README.md index 7890a74..e7c2212 100644 --- a/almond/README.md +++ b/almond/README.md @@ -8,7 +8,7 @@ Almond For Home Servers. ## Installation -The installation of this add-on is straightforward and easy to do. +Follow these steps to get the add-on installed on your system: 1. Navigate in your Home Assistant frontend to **Hass.io** -> **Add-on Store**. 2. Find the "Almond" add-on and click it. @@ -19,15 +19,13 @@ The installation of this add-on is straightforward and easy to do. The basic thing to get the add-on running would be: 1. Start the add-on. +2. Go the the Home Assistant frontend -> **Configuration** -> **Integrations** + to configure Home Assistant to use this add-on. After starting, + it will be automatically discovered by Home Assistant. ## Configuration -Example add-on configuration: - -```json -{ -} -``` +This add-on has no additional configuration options. ## Support