ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-13 14:12:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to node 10 for supported architectures

Browse Source 
Change-type: minor
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-01-16 15:20:56 +00:00
parent b84f354ded
commit 56bac3a7ea
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@ -2,18 +2,18 @@ ARG ARCH=amd64
# The node version here should match the version of the runtime image which is
# specified in the base-image subdirectory in the project
FROM balenalib/raspberry-pi-node:8-run as rpi-node-base
FROM balenalib/armv7hf-node:8-run as armv7hf-node-base
FROM balenalib/aarch64-node:8-run as aarch64-node-base
FROM balenalib/raspberry-pi-node:10-run as rpi-node-base
FROM balenalib/armv7hf-node:10-run as armv7hf-node-base
FROM balenalib/aarch64-node:10-run as aarch64-node-base
RUN [ "cross-build-start" ]
RUN sed -i '/security.debian.org jessie/d' /etc/apt/sources.list
RUN [ "cross-build-end" ]
FROM balenalib/amd64-node:8-run as amd64-node-base
FROM balenalib/amd64-node:10-run as amd64-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 balenalib/i386-node:8-run as i386-node-base
FROM balenalib/i386-debian 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
@ -31,8 +31,7 @@ FROM amd64-node-base as i386-node-build
FROM balenalib/amd64-node:6-build as i386-nlp-node-build
##############################################################################
# We always do the webpack build on amd64, cause it's way faster
FROM amd64-node-base as node-build
FROM $ARCH-node-build as node-build
WORKDIR /usr/src/app
@ -113,7 +112,7 @@ RUN [ "cross-build-end" ]
##############################################################################
# Minimal runtime image
FROM balena/$ARCH-supervisor-base:v1.4.4
FROM balena/$ARCH-supervisor-base:v1.4.6
ARG ARCH
ARG VERSION=master
ARG DEFAULT_MIXPANEL_TOKEN=bananasbananas

6
package-lock.json generated
View File

@ -2520,9 +2520,9 @@
}
},
"docker-delta": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-2.2.4.tgz",
"integrity": "sha512-rb2d2S+2pibHXA2ODZvGMaCupAgGXQTpoSBXCZlRLA9EGdy6HatowGha5IWJ70h65+6O3CC9xNaaGEzfNJko3w==",
"version": "2.2.9",
"resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-2.2.9.tgz",
"integrity": "sha512-2avbIg8rpg8uRqYAux4df5HAJChbx+W3LQMMeafOY7m3bt1wlaJVPDIKbh0mCuquicp5JKnFNiGU8+V558J/Ng==",
"dev": true,
"requires": {
"bluebird": "^3.4.0",