[ARVADOS] updated: ba4d612f8448337f555d369ec383d9b4cc055e79
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 22 16:26:41 EDT 2014
Summary of changes:
doc/install/install-docker.html.textile.liquid | 2 +-
docker/build_tools/Makefile | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
via ba4d612f8448337f555d369ec383d9b4cc055e79 (commit)
from aaafb72c1efb215dd6f6008c98a28f13f850b7fa (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 ba4d612f8448337f555d369ec383d9b4cc055e79
Author: Ward Vandewege <ward at curoverse.com>
Date: Tue Jul 22 16:26:18 2014 -0400
Make --deepclean also remove the crosbymichael/skydns and crosbymichael/skydock images.
refs #3219
diff --git a/doc/install/install-docker.html.textile.liquid b/doc/install/install-docker.html.textile.liquid
index 31342e5..091d861 100644
--- a/doc/install/install-docker.html.textile.liquid
+++ b/doc/install/install-docker.html.textile.liquid
@@ -96,7 +96,7 @@ You can also use '--realclean', which does what '--clean' does and in addition r
<pre><code>~$ <span class="userinput">./build.sh --realclean</span></code></pre>
</notextile>
-Finally, the '--deepclean' option does what '--realclean' does, and also removes the arvados/debian image.
+Finally, the '--deepclean' option does what '--realclean' does, and also removes the arvados/debian, crosbymichael/skydns and crosbymichael/skydock images.
<notextile>
<pre><code>~$ <span class="userinput">./build.sh --deepclean</span></code></pre>
diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 64a1213..ff95935 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -17,13 +17,15 @@ realclean: clean
-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
-$(DOCKER) rmi `$(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE)`
-# `make deepclean' will remove all Arvados docker images and force
-# subsequent makes to build the entire chain from the ground up
+# `make deepclean' will remove all Arvados docker images and the skydns/skydock
+# images and force subsequent makes to build the entire chain from the ground up
deepclean: clean
-rm debian-arvados-image
-[ -n "`$(DOCKER) ps -q`" ] && $(DOCKER) stop `$(DOCKER) ps -q`
-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
-$(DOCKER) rmi `$(DOCKER) images -q arvados/*`
+ -$(DOCKER) rm `$(DOCKER) ps -a |grep -e crosbymichael/skydns -e crosbymichael/skydock |cut -f 1 -d' '`
+ -$(DOCKER) rmi `$(DOCKER) images -q crosbymichael/skyd*`
# ============================================================
# Dependencies for */generated files which are prerequisites
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list