Merge branch 'master' into hdmi_scheduler

Author: escoand

.versionbot/CHANGELOG.yml

@@ -0,0 +1,41 @@
+- commits:
+    - subject: 'photos: switch to multistage build'
+      hash: e01761f3da284ce8b52616ea83e80b4b007bdc71
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Shaun Mulligan shaun@balena.io
+        signed-off-by: Shaun Mulligan shaun@balena.io
+      author: Shaun Mulligan
+  version: 0.7.2
+  date: 2019-10-01T06:54:34.536Z
+- commits:
+    - subject: add sleep when starting wifi-connect
+      hash: e669fbfb400fe6c7d7f8173cfa65a5ea4da1042a
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Shaun Mulligan <shaun@balena.io>
+        signed-off-by: Shaun Mulligan <shaun@balena.io>
+      author: Shaun Mulligan
+  version: 0.7.1
+  date: 2019-09-30T14:34:34.712Z
+- commits:
+    - subject: Add machine-readable changelog
+      hash: 97fd7e1fafc3525fc70f6fc9948b4019d62fa714
+      body: ''
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Dimitrios Lytras
+    - subject: Enable scrutinizer
+      hash: cffe8aaf6673f5fdacd98a8475fd09f2dd0684b9
+      body: ''
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Dimitrios Lytras
+  version: 0.7.0
+  date: 2019-09-25T12:44:33.711Z

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v0.7.2
+## (2019-10-01)
+
+* photos: switch to multistage build [Shaun Mulligan]
+
+# v0.7.1
+## (2019-09-30)
+
+* add sleep when starting wifi-connect [Shaun Mulligan]
+
+# v0.7.0
+## (2019-09-25)
+
+* Add machine-readable changelog [Dimitrios Lytras]
+* Enable scrutinizer [Dimitrios Lytras]
+
 # v0.6.1
 ## (2019-08-19)
 

README.md

@@ -60,7 +60,7 @@ The balenaDash project includes [wifi-connect](https://github.com/balena-io/wifi
 
 WiFi Connect periodically tests for a functional internet connection, if nothing is found the device sets itself up as a WiFi access point named `balenaDash` that you can join with a mobile device.
 
-To use WiFi Connect you need to join the `balenaDash` network and you should see a captive portal popup. If not, ensure that you remain connected to the `balenaDash` network and visit the IP address of the device in a browser on port `80`. For example `http://<ip of balenaDash device>`. This will allow you to access WiFi Connect, perform a site survey and join a different WiFi network.
+To use WiFi Connect you need to join the `balenaDash` network and you should see a captive portal popup. The passphrase is `balenaDash`. If not, ensure that you remain connected to the `balenaDash` network and visit the IP address of the device in a browser on port `80`. For example `http://<ip of balenaDash device>`. This will allow you to access WiFi Connect, perform a site survey and join a different WiFi network.
 
 ## Controlling content
 

VERSION

@@ -1 +1 @@
-0.6.1
+0.7.2

photos/Dockerfile.template

@@ -1,14 +1,18 @@
-FROM balenalib/%%BALENA_MACHINE_NAME%%-node:11-buster-build
+FROM balenalib/%%BALENA_MACHINE_NAME%%-node:11-buster-build AS build
 
 # Defines our working directory in container
-WORKDIR /usr/src/app~
+WORKDIR /usr/src/app
 
 # Copies the package.json first for better cache on later pushes
 COPY package.json package.json
 
 # This install npm dependencies on the balena build server,
 # making sure to clean up the artifacts it creates in order to reduce the image size.
-RUN JOBS=MAX npm install --production --unsafe-perm && npm cache verify && rm -rf /tmp/
+RUN JOBS=MAX npm install --production --unsafe-perm && npm cache verify
+
+FROM balenalib/%%BALENA_MACHINE_NAME%%-node:11-buster
+
+COPY --from=build /usr/src/app/node_modules node_modules
 
 # This will copy all files in our root to the working  directory in the container
 COPY . ./

repo.yml

@@ -1 +1,2 @@
 type: generic
+publishMetadata: true

wifi-connect/start.sh

@@ -2,7 +2,7 @@
 
 export DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
 
-
+sleep 10
 while [[ true ]]; do
   # Choose a condition for running WiFi Connect according to your use case: