ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-19 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Upgrade to node 8 for supported architectures"

Browse Source 
This reverts commit 338ba4cdd7.

This is to unblock the release of the supervisor version, pending the
fix of the introduction of the race condition currently affecting v2
deltas.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-02-19 14:48:19 +00:00
parent 112bc644c4
commit b3a07da8e4
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Dockerfile
View File

@ -2,37 +2,27 @@ ARG ARCH=amd64
# The node version here should match the version of the runtime image which is # The node version here should match the version of the runtime image which is
# specified in the base-image subdirectory in the project # specified in the base-image subdirectory in the project
FROM balenalib/raspberry-pi-node:8-run as rpi-node-base FROM resin/rpi-node:6.13.1-slim as rpi-node-base
FROM balenalib/armv7hf-node:8-run as armv7hf-node-base FROM resin/armv7hf-node:6.13.1-slim as armv7hf-node-base
FROM balenalib/aarch64-node:8-run as aarch64-node-base FROM resin/aarch64-node:6.13.1-slim as aarch64-node-base
RUN [ "cross-build-start" ] RUN [ "cross-build-start" ]
RUN sed -i '/security.debian.org jessie/d' /etc/apt/sources.list RUN sed -i '/security.debian.org jessie/d' /etc/apt/sources.list
RUN [ "cross-build-end" ] RUN [ "cross-build-end" ]
FROM balenalib/amd64-node:8-run as amd64-node-base FROM resin/amd64-node:6.13.1-slim as amd64-node-base
RUN echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-start && chmod +x /usr/bin/cross-build-start \ 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 && 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 resin/i386-node:6.13.1-slim as i386-node-base
RUN echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-start && chmod +x /usr/bin/cross-build-start \ 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 && echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-end && chmod +x /usr/bin/cross-build-end
FROM resin/i386-node:6.13.1-slim as i386-nlp-node-base FROM i386-node-base as i386-nlp-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
# Setup webpack building base images
# We always do the webpack build on amd64, cause it's way faster
FROM amd64-node-base as rpi-node-build
FROM amd64-node-base as amd64-node-build
FROM amd64-node-base as armv7hf-node-build
FROM amd64-node-base as aarch64-node-build
FROM amd64-node-base as i386-node-build
FROM balenalib/amd64-node:6-build as i386-nlp-node-build
############################################################################## ##############################################################################
FROM $ARCH-node-build as node-build # We always do the webpack build on amd64, cause it's way faster
FROM amd64-node-base as node-build
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -113,7 +103,7 @@ RUN [ "cross-build-end" ]
############################################################################## ##############################################################################
# Minimal runtime image # Minimal runtime image
FROM balena/$ARCH-supervisor-base:v1.4.4 FROM resin/$ARCH-supervisor-base:v1.3.0
ARG ARCH ARG ARCH
ARG VERSION=master ARG VERSION=master
ARG DEFAULT_MIXPANEL_TOKEN=bananasbananas ARG DEFAULT_MIXPANEL_TOKEN=bananasbananas