From 4fb54b471d96f89983dace1f690e22026eb9c2f6 Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Tue, 29 Jul 2014 15:21:17 +0100 Subject: [PATCH] Force the removal of the old container when trying to start a build. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 031459b4..9636196e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ else docker pull $(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO):$(BUILDSTEP_VERSION) endif docker tag $(BUILDSTEP_REGISTRY)/$(BUILDSTEP_REPO):$(BUILDSTEP_VERSION) resin/supervisor-base:latest - docker rm build-supervisor-latest 2> /dev/null || true + docker rm -f build-supervisor-latest 2> /dev/null || true docker run --name build-supervisor-latest --volumes-from $(ACCELERATOR):ro -v `pwd`:/tmp/app resin/supervisor-base:latest bash -i -c ". /.env && cp -r /tmp/app /app && /build/builder" docker commit build-supervisor-latest $(IMAGE):$(SUPERVISOR_VERSION) > /dev/null docker tag $(IMAGE):$(SUPERVISOR_VERSION) $(SUPERVISOR_REGISTRY)/$(IMAGE):$(SUPERVISOR_VERSION)