From 438e57853b1fdf564cbbcedcfeb4fc5afb3ca687 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Tue, 24 Feb 2015 14:38:07 +0000 Subject: [PATCH] Leave the docker image .tar files in the weave directory Making things into /var/tmp is a bit odd, and this works better in the context of the containerized build. --- .gitignore | 3 +++ Makefile | 6 +++--- site/building.md | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c1df85ea..429197cc 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ weavedns/weavedns tools/bin tools/build releases +weave.tar +weavedns.tar +weavetools.tar diff --git a/Makefile b/Makefile index 8a15e798..48452279 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,9 @@ WEAVETOOLS_EXES=tools/bin WEAVER_IMAGE=$(DOCKERHUB_USER)/weave WEAVEDNS_IMAGE=$(DOCKERHUB_USER)/weavedns WEAVETOOLS_IMAGE=$(DOCKERHUB_USER)/weavetools -WEAVER_EXPORT=/var/tmp/weave.tar -WEAVEDNS_EXPORT=/var/tmp/weavedns.tar -WEAVETOOLS_EXPORT=/var/tmp/weavetools.tar +WEAVER_EXPORT=weave.tar +WEAVEDNS_EXPORT=weavedns.tar +WEAVETOOLS_EXPORT=weavetools.tar all: $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVETOOLS_EXPORT) diff --git a/site/building.md b/site/building.md index cc3ad3bc..01b1c85a 100644 --- a/site/building.md +++ b/site/building.md @@ -47,7 +47,7 @@ $ make This will build the weave components and package them into three Docker images (`zettio/weave`, `zettio/weavedns`, and `zettio/weavetools`). These are then exported (as -`/var/tmp/weave.tar`, `weavends.tar` and `weavetools.tar`). +`weave.tar`, `weavends.tar` and `weavetools.tar`). ## Building in a Docker container