diff --git a/CHANGELOG.md b/CHANGELOG.md index 50957b67..c7ced4fe 100644 --- a/CHANGELOG.md +++ b/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.6.7 - 2018-02-27 + +* Since armel builds are disabled, do not pull an armel node base image, and ensure we never deploy an armel supervisor #560 [Pablo Carranza Velez] + ## v6.6.6 - 2018-02-27 * Update docker-delta to 2.0.4 #558 [Akis Kesoglou] diff --git a/Dockerfile b/Dockerfile index e586aec8..a67eaf58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -104,7 +104,6 @@ RUN rsync -a --delete /go/bin/gosuper /build/ # specified in the base-image subdirectory in the project FROM resin/rpi-node:6.5-slim as rpi-node-base FROM resin/armv7hf-node:6.5-slim as armv7hf-node-base -FROM resin/armel-node:6.5-slim as armel-node-base FROM resin/aarch64-node:6.5-slim as aarch64-node-base FROM resin/amd64-node:6.5-slim as amd64-node-base diff --git a/automation/deploy-to-resin.js b/automation/deploy-to-resin.js index c0401b9e..a23a827c 100644 --- a/automation/deploy-to-resin.js +++ b/automation/deploy-to-resin.js @@ -32,7 +32,7 @@ if (_.isEmpty(tag)) { process.exit(1); } -const supportedArchitectures = [ 'amd64', 'rpi', 'aarch64', 'armel', 'i386', 'armv7hf', 'i386-nlp' ]; +const supportedArchitectures = [ 'amd64', 'rpi', 'aarch64', 'i386', 'armv7hf', 'i386-nlp' ]; if (!_.isEmpty(arch) && !_.includes(supportedArchitectures, arch)) { console.error('Invalid architecture ' + arch); process.exit(1); diff --git a/circle.yml b/circle.yml index 4ae9284e..95da24d0 100644 --- a/circle.yml +++ b/circle.yml @@ -84,14 +84,6 @@ jobs: PUSH_IMAGES: "true" STAGING_API_ENDPOINT: https://api.resinstaging.io PRODUCTION_API_ENDPOINT: https://api.resin.io - armel: - <<: *defaults - environment: - DOCKER_USERNAME: travisciresin - ARCH: armel - PUSH_IMAGES: "true" - STAGING_API_ENDPOINT: https://api.resinstaging.io - PRODUCTION_API_ENDPOINT: https://api.resin.io armv7hf: <<: *defaults environment: diff --git a/package.json b/package.json index 769dd986..390e2c4c 100644 --- a/package.json +++ b/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.6.6", + "version": "6.6.7", "license": "Apache-2.0", "repository": { "type": "git",