Auto-merge for PR #512 via VersionBot

Fixes #511, add support for new supervisor image for IOT2000 board

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/).
 
+## v6.4.0 - 2017-11-01
+
+* Fixes #511, add support for new supervisor image for x86 with quark cpu boards. #512 [Trong Nghia Nguyen]
+
 ## v6.3.11 - 2017-11-01
 
 * Add whitelist-based filtering to mixpanel events #500 [Pablo Carranza Velez]

Dockerfile

@@ -115,6 +115,8 @@ FROM resin/i386-node:6.5-slim as i386-node-base
 RUN echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-start && chmod +x /usr/bin/cross-build-start \
 	&& echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-end && chmod +x /usr/bin/cross-build-end
 
+FROM i386-node-base as i386-nlp-node-base
+
 # Build nodejs dependencies
 FROM $ARCH-node-base as node
 ARG ARCH

automation/deploy-to-resin.js

@@ -32,7 +32,7 @@ if (_.isEmpty(tag)) {
 	process.exit(1);
 }
 
-const supportedArchitectures = [ 'amd64', 'rpi', 'aarch64', 'armel', 'i386', 'armv7hf' ];
+const supportedArchitectures = [ 'amd64', 'rpi', 'aarch64', 'armel', 'i386', 'armv7hf', 'i386-nlp' ];
 if (!_.isEmpty(arch) && !_.includes(supportedArchitectures, arch)) {
 	console.error('Invalid architecture ' + arch);
 	process.exit(1);

base-image/build.sh

@@ -23,6 +23,9 @@ case "$ARCH" in
 'aarch64')
 	export TARGET_MACHINE='generic-armv8'
 ;;
+'i386-nlp')
+	export TARGET_MACHINE='i386-nlp'
+;;
 esac
 
 export SOURCE_DIR=/source

base-image/build/conf/machine/i386-nlp.conf

@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for x86 with quark cpu boards.
+
+require conf/machine/include/tune-i586-nlp.inc

circle.yml

@@ -72,6 +72,14 @@ jobs:
       PUSH_IMAGES: "true"
       STAGING_API_ENDPOINT: https://api.resinstaging.io
       PRODUCTION_API_ENDPOINT: https://api.resin.io
+  i386-nlp:
+    <<: *defaults
+    environment:
+      DOCKER_USERNAME: travisciresin
+      ARCH: i386-nlp
+      PUSH_IMAGES: "true"
+      STAGING_API_ENDPOINT: https://api.resinstaging.io
+      PRODUCTION_API_ENDPOINT: https://api.resin.io
   armel:
     <<: *defaults
     environment:
@@ -114,3 +122,4 @@ workflows:
       - rpi
       - armv7hf
       - aarch64
+      - i386-nlp

gosuper/build.sh

@@ -12,6 +12,9 @@ case "$ARCH" in
 'i386')
 	export GOARCH=386
 ;;
+'i386-nlp')
+	export GOARCH=386
+;;
 'rpi')
 	export GOARCH=arm
 	export GOARM=6

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": "6.3.11",
+  "version": "6.4.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",