ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-18 10:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Makefile and env to handle changes in resin-vars

Browse Source
This commit is contained in:
Praneeth Bodduluri 2015-09-10 14:03:23 +03:00 committed by Pablo Carranza Vélez
parent 6e62366541
commit 54d25f5202
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -33,7 +33,7 @@ supervisor-dind:
run-supervisor: supervisor-dind stop-supervisor
cd tools/dind \
&& sed --in-place -e "s|SUPERVISOR_IMAGE=.*|SUPERVISOR_IMAGE=$(DEPLOY_REGISTRY)$(IMAGE) |" config/env \
&& docker run -d --name resin_supervisor_1 --privileged -v $$(pwd)/config.json:/usr/src/app/config/config.json -v $$(pwd)/config/env:/usr/src/app/config/env -v /sys/fs/cgroup:/sys/fs/cgroup:ro resin/resin-supervisor-dind:$(SUPERVISOR_VERSION)
&& docker run -d --name resin_supervisor_1 --privileged -v $$(pwd)/config.json:/mnt/conf/config.json -v $$(pwd)/config/env:/usr/src/app/config/env -v /sys/fs/cgroup:/sys/fs/cgroup:ro resin/resin-supervisor-dind:$(SUPERVISOR_VERSION)
stop-supervisor:
# Stop docker and remove volumes to prevent us from running out of loopback devices,

2
tools/dind/config/env
View File

@ -1,4 +1,4 @@
CONFIG_PATH=/usr/src/app/config/config.json
CONFIG_PATH=/mnt/conf/config.json
LED_FILE=/dev/null
RESIN_SUPERVISOR_SECRET=bananas
SUPERVISOR_IMAGE=