Auto-merge for PR #602 via VersionBot

Add ability to use self-signed CAs passed via `config.json`.

CHANGELOG.md

@@ -4,6 +4,10 @@ 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/).
 
+## v7.4.0 - 2018-04-11
+
+* Add ability to use self-signed CAs passed via `config.json`. #602 [Heds Simons]
+
 ## v7.3.0 - 2018-04-10
 
 * Move to Node 6.13.1. #624 [Heds Simons]

entry.sh

@@ -23,4 +23,13 @@ fi
 
 export DBUS_SYSTEM_BUS_ADDRESS="unix:path=/mnt/root/run/dbus/system_bus_socket"
 
+# Include self-signed CAs, should they exist
+if [ ! -z "${BALENA_ROOT_CA}" ]; then
+	if [ ! -e '/etc/ssl/certs/balenaRootCA.pem' ]; then
+		mkdir -p /usr/local/share/ca-certificates
+		echo "${BALENA_ROOT_CA}" > /usr/local/share/ca-certificates/balenaRootCA.crt
+		update-ca-certificates
+	fi
+fi
+
 exec node /usr/src/app/dist/app.js

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",