Merge pull request #891 from home-assistant/frenck-2019-0316

Small improvements to the Almond add-on

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

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
 

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"

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",
@@ -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"
 }