github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't --rm containers on circle.

Browse Source
This commit is contained in:
Tom Wilkie
2015-09-14 04:16:52 +00:00
parent f4a426daa1
commit fdf89a7fc7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -17,6 +17,7 @@ SCOPE_VERSION=$(shell git rev-parse --short HEAD)
DOCKER_VERSION=1.3.1
DOCKER_DISTRIB=docker/docker-$(DOCKER_VERSION).tgz
DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(DOCKER_VERSION).tgz
RM=--rm
all: $(SCOPE_EXPORT)
@@ -55,22 +56,22 @@ static: client/build/app.js
client/build/app.js: client/app/scripts/*
mkdir -p client/build
docker run -ti --rm -v $(shell pwd)/client/app:/home/weave/app \
docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \
-v $(shell pwd)/client/build:/home/weave/build \
$(SCOPE_UI_BUILD_IMAGE) npm run build
client-test: client/test/*
docker run -ti --rm -v $(shell pwd)/client/app:/home/weave/app \
docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \
-v $(shell pwd)/client/test:/home/weave/test \
$(SCOPE_UI_BUILD_IMAGE) npm test
client-lint:
docker run -ti --rm -v $(shell pwd)/client/app:/home/weave/app \
docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \
-v $(shell pwd)/client/test:/home/weave/test \
$(SCOPE_UI_BUILD_IMAGE) npm run lint
client-start:
docker run -ti --rm --net=host -v $(shell pwd)/client/app:/home/weave/app \
docker run -ti $(RM) --net=host -v $(shell pwd)/client/app:/home/weave/app \
-v $(shell pwd)/client/build:/home/weave/build \
$(SCOPE_UI_BUILD_IMAGE) npm start
@@ -83,7 +84,7 @@ $(SCOPE_BACKEND_BUILD_UPTODATE): backend/*
touch $@
backend: $(SCOPE_BACKEND_BUILD_UPTODATE)
docker run -ti --rm -v $(shell pwd):/go/src/github.com/weaveworks/scope $(SCOPE_BACKEND_BUILD_IMAGE) /build.bash
docker run -ti $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope $(SCOPE_BACKEND_BUILD_IMAGE) /build.bash
clean:
go clean ./...

4
circle.yml
View File

@@ -40,8 +40,8 @@ dependencies:
test:
override:
- cd $SRCDIR; $TOOLS/lint .
- cd $SRCDIR; make client-test
- cd $SRCDIR; make static
- cd $SRCDIR; make RM= client-test
- cd $SRCDIR; make RM= static
- cd $SRCDIR; rm -f app/scope-app probe/scope-probe; make
- cd $SRCDIR; $TOOLS/test -slow
- cd $SRCDIR/experimental; make