ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-02 15:50:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #560 via VersionBot

Browse Source 
Since armel builds are disabled, do not pull an armel node base image…
This commit is contained in:
resin-io-versionbot[bot] 2018-02-27 17:25:26 +00:00 committed by GitHub
commit cb450a7f59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). 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 ## v6.6.6 - 2018-02-27
* Update docker-delta to 2.0.4 #558 [Akis Kesoglou] * Update docker-delta to 2.0.4 #558 [Akis Kesoglou]

1
Dockerfile
View File

@ -104,7 +104,6 @@ RUN rsync -a --delete /go/bin/gosuper /build/
# specified in the base-image subdirectory in the project # specified in the base-image subdirectory in the project
FROM resin/rpi-node:6.5-slim as rpi-node-base FROM resin/rpi-node:6.5-slim as rpi-node-base
FROM resin/armv7hf-node:6.5-slim as armv7hf-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/aarch64-node:6.5-slim as aarch64-node-base
FROM resin/amd64-node:6.5-slim as amd64-node-base FROM resin/amd64-node:6.5-slim as amd64-node-base

2
automation/deploy-to-resin.js
View File

@ -32,7 +32,7 @@ if (_.isEmpty(tag)) {
process.exit(1); 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)) { if (!_.isEmpty(arch) && !_.includes(supportedArchitectures, arch)) {
console.error('Invalid architecture ' + arch); console.error('Invalid architecture ' + arch);
process.exit(1); process.exit(1);

8
circle.yml
View File

@ -84,14 +84,6 @@ jobs:
PUSH_IMAGES: "true" PUSH_IMAGES: "true"
STAGING_API_ENDPOINT: https://api.resinstaging.io STAGING_API_ENDPOINT: https://api.resinstaging.io
PRODUCTION_API_ENDPOINT: https://api.resin.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: armv7hf:
<<: *defaults <<: *defaults
environment: environment:

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "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.", "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", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",