ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-31 16:35:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better volume handling

Browse Source
This commit is contained in:
Pablo Carranza Vélez 2015-07-16 20:12:09 +00:00
parent fb019d7192
commit f87c4915da
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -16,17 +16,16 @@ clean:
supervisor-dind: supervisor-dind:
cd tools/dind && docker build --no-cache=$(DISABLE_CACHE) -t resin/resin-supervisor-dind:$(SUPERVISOR_VERSION) . cd tools/dind && docker build --no-cache=$(DISABLE_CACHE) -t resin/resin-supervisor-dind:$(SUPERVISOR_VERSION) .
run-supervisor: supervisor-dind run-supervisor: supervisor-dind stop-supervisor
-docker stop resin_supervisor_1 > /dev/null
-docker rm -f resin_supervisor_1 > /dev/null
cd tools/dind \ cd tools/dind \
&& sed --in-place -e "s|SUPERVISOR_IMAGE=.*|SUPERVISOR_IMAGE=$(DEPLOY_REGISTRY)$(IMAGE) |" config/env \ && 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:/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)
stop-supervisor: stop-supervisor:
# Prevent us from running out of loopback devices, as per https://github.com/jpetazzo/dind/issues/19 -docker stop resin_supervisor_1 > /dev/null
docker exec resin_supervisor_1 umount /var/lib/docker # Remove volumes to prevent us from running out of loopback devices,
docker stop resin_supervisor_1 # as per https://github.com/jpetazzo/dind/issues/19
-docker rm -f --volumes resin_supervisor_1 > /dev/null
supervisor: supervisor:
cp Dockerfile.$(ARCH) Dockerfile cp Dockerfile.$(ARCH) Dockerfile