ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-18 23:38:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Since armel builds are disabled, do not pull an armel node base image, and ensure we never deploy an armel supervisor

Browse Source 
Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez
2018-02-26 16:46:48 -08:00
parent 580873d069
commit c463f7fa5b
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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: