ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-03-10 14:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the dummy node-build step for debug images

Browse Source 
Change-type: patch
This commit is contained in:
Pagan Gazzard 2019-07-19 18:08:25 +01:00
parent 31257f8f39
commit ec816d115e
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.debug
View File

@ -22,8 +22,6 @@ FROM balenalib/i386-nlp-node:6-jessie as i386-nlp-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
# A little hack to make this work with the makefile
FROM $ARCH-node-base AS node-build
FROM $ARCH-node-base AS node-deps FROM $ARCH-node-base AS node-deps
RUN [ "cross-build-start" ] RUN [ "cross-build-start" ]

30
automation/build.sh
View File

@ -45,10 +45,6 @@ TARGET_IMAGE=balena/$ARCH-supervisor:$TAG$DEBUG
NODE_IMAGE=balena/$ARCH-supervisor-node:$TAG$DEBUG NODE_IMAGE=balena/$ARCH-supervisor-node:$TAG$DEBUG
NODE_BUILD_IMAGE=balena/$ARCH-supervisor-node:$TAG-build$DEBUG NODE_BUILD_IMAGE=balena/$ARCH-supervisor-node:$TAG-build$DEBUG
TARGET_CACHE=$TARGET_IMAGE
NODE_CACHE=$NODE_IMAGE
NODE_BUILD_CACHE=$NODE_BUILD_IMAGE
TARGET_CACHE_MASTER=balena/$ARCH-supervisor:master$DEBUG TARGET_CACHE_MASTER=balena/$ARCH-supervisor:master$DEBUG
NODE_CACHE_MASTER=balena/$ARCH-supervisor-node:master$DEBUG NODE_CACHE_MASTER=balena/$ARCH-supervisor-node:master$DEBUG
NODE_BUILD_CACHE_MASTER=balena/$ARCH-supervisor-node:master-build$DEBUG NODE_BUILD_CACHE_MASTER=balena/$ARCH-supervisor-node:master-build$DEBUG
@ -63,23 +59,29 @@ function useCache() {
docker pull $image & docker pull $image &
} }
useCache $TARGET_CACHE useCache $TARGET_IMAGE
useCache $TARGET_CACHE_MASTER useCache $TARGET_CACHE_MASTER
useCache $NODE_CACHE useCache $NODE_IMAGE
useCache $NODE_CACHE_MASTER useCache $NODE_CACHE_MASTER
useCache $NODE_BUILD_CACHE # Debug images don't include nodebuild
useCache $NODE_BUILD_CACHE_MASTER if [ -z "$DEBUG" ]; then
useCache $NODE_BUILD_IMAGE
useCache $NODE_BUILD_CACHE_MASTER
fi
wait wait
export DOCKER_BUILD_OPTIONS=${CACHE_FROM} export DOCKER_BUILD_OPTIONS=${CACHE_FROM}
export ARCH export ARCH
export MIXPANEL_TOKEN export MIXPANEL_TOKEN
make IMAGE=$NODE_BUILD_IMAGE nodebuild # Debug images don't include nodebuild
if [ "$PUSH_IMAGES" = "true" ]; then if [ -z "$DEBUG" ]; then
make IMAGE=$NODE_BUILD_IMAGE deploy & make IMAGE=$NODE_BUILD_IMAGE nodebuild
if [ "$PUSH_IMAGES" = "true" ]; then
make IMAGE=$NODE_BUILD_IMAGE deploy &
fi
export DOCKER_BUILD_OPTIONS="${DOCKER_BUILD_OPTIONS} --cache-from ${NODE_BUILD_IMAGE}"
fi fi
export DOCKER_BUILD_OPTIONS="${DOCKER_BUILD_OPTIONS} --cache-from ${NODE_BUILD_IMAGE}"
make IMAGE=$NODE_IMAGE nodedeps make IMAGE=$NODE_IMAGE nodedeps
if [ "$PUSH_IMAGES" = "true" ]; then if [ "$PUSH_IMAGES" = "true" ]; then
@ -106,7 +108,5 @@ if [ "$CLEANUP" = "true" ]; then
$TARGET_IMAGE \ $TARGET_IMAGE \
$NODE_IMAGE \ $NODE_IMAGE \
$NODE_BUILD_IMAGE \ $NODE_BUILD_IMAGE \
$TARGET_CACHE \ $TARGET_CACHE
$NODE_BUILD_CACHE \
$NODE_CACHE
fi fi