ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-21 06:33:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move to Node 6.13.1.

Browse Source 
Connects-to: #623
Change-type: minor
This commit is contained in:
Heds Simons 2018-04-09 11:54:55 +01:00
parent b91d6500b1
commit 4eb796b9f4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -2,15 +2,15 @@ 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 resin/rpi-node:6.5-slim as rpi-node-base FROM resin/rpi-node:6.13.1-slim as rpi-node-base
FROM resin/armv7hf-node:6.5-slim as armv7hf-node-base FROM resin/armv7hf-node:6.13.1-slim as armv7hf-node-base
FROM resin/aarch64-node:6.5-slim as aarch64-node-base FROM resin/aarch64-node:6.13.1-slim as aarch64-node-base
FROM resin/amd64-node:6.5-slim 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 resin/i386-node:6.5-slim 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
@ -97,7 +97,7 @@ RUN [ "cross-build-end" ]
############################################################################## ##############################################################################
# Minimal runtime image # Minimal runtime image
FROM resin/$ARCH-supervisor-base:v1.1.0 FROM resin/$ARCH-supervisor-base:v1.2.0
ARG ARCH ARG ARCH
ARG VERSION=master ARG VERSION=master
ARG DEFAULT_PUBNUB_PUBLISH_KEY=pub-c-bananas ARG DEFAULT_PUBNUB_PUBLISH_KEY=pub-c-bananas

2
package.json
View File

@ -19,7 +19,7 @@
"sqlite3": "^3.1.0" "sqlite3": "^3.1.0"
}, },
"engines": { "engines": {
"node": "^6.5.0" "node": "^6.13.1"
}, },
"devDependencies": { "devDependencies": {
"JSONStream": "^1.1.2", "JSONStream": "^1.1.2",