[ARVADOS] updated: bfad82d8a22d09b606004ab24b4bb055d8ebb607
git at public.curoverse.com
git at public.curoverse.com
Mon Dec 30 17:23:35 EST 2013
Summary of changes:
docker/Makefile | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
via bfad82d8a22d09b606004ab24b4bb055d8ebb607 (commit)
via 3b5a49630647ef1bd48c652124d18db6faa7fa33 (commit)
from 0b7ddcd0f4d867b1794bf0a0b67a6120d3345fbd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit bfad82d8a22d09b606004ab24b4bb055d8ebb607
Merge: 3b5a496 0b7ddcd
Author: Tim Pierce <twp at clinicalfuture.com>
Date: Mon Dec 30 17:20:52 2013 -0500
Merge branch 'master' of git.clinicalfuture.com:arvados
commit 3b5a49630647ef1bd48c652124d18db6faa7fa33
Author: Tim Pierce <twp at clinicalfuture.com>
Date: Mon Dec 30 17:20:13 2013 -0500
Add `make realclean' target for removing cached Docker images from a build.
diff --git a/docker/Makefile b/docker/Makefile
index 3b21b43..5ff415a 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,8 +1,17 @@
all: api-image doc-image workbench-image warehouse-image sso-image
+# `make clean' removes the files generated in the build directory
+# but does not remove any docker images generated in previous builds
clean:
-rm *-image */generated/*
+# `make realclean' will also remove the docker images and force
+# subsequent makes to build the entire chain from the ground up
+realclean: clean
+ docker stop $(docker ps -q)
+ docker rm $(docker ps -a -q)
+ docker rmi $(docker images -q)
+
# ============================================================
# Dependencies for */generated files which are prerequisites
# for building docker images.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list