Compress weave.tar to save upload time

This commit is contained in:
Bryan Boreham committed 2015-11-09 17:18:58 +00:00
1 parent fa5bcd0457
commit 17c835e672
4 files changed
+7 -7

No files matched your search

+1 -1
View File
@@ -48,7 +48,7 @@ releases
.weaver.uptodate
.weavedns.uptodate
.weaveexec.uptodate
weave.tar
weave.tar.gz
prog/weaveexec/weave
prog/weaveexec/weavehosts
prog/weaveexec/weaveproxy
+2 -2
View File
@@ -30,7 +30,7 @@ WEAVEEXEC_IMAGE=$(DOCKERHUB_USER)/weaveexec
IMAGES=$(WEAVER_IMAGE) $(WEAVEEXEC_IMAGE)
WEAVE_EXPORT=weave.tar
WEAVE_EXPORT=weave.tar.gz
WEAVEEXEC_DOCKER_VERSION=1.3.1
DOCKER_DISTRIB=prog/weaveexec/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz
@@ -105,7 +105,7 @@ $(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPR
touch $@
$(WEAVE_EXPORT): $(IMAGES_UPTODATE)
$(SUDO) docker save $(addsuffix :latest,$(IMAGES)) > $@
$(SUDO) docker save $(addsuffix :latest,$(IMAGES)) | gzip > $@
$(DOCKER_DISTRIB):
curl -o $(DOCKER_DISTRIB) $(DOCKER_DISTRIB_URL)
+3 -3
View File
@@ -54,7 +54,7 @@ $ make
This will build the weave components and package them into three
Docker images (`weaveworks/weave`, `weaveworks/weavedns`, and
`weaveworks/weaveexec`). These are then exported as `weave.tar`.
`weaveworks/weaveexec`). These are then exported as `weave.tar.gz`.
## Building in a Docker container
@@ -167,13 +167,13 @@ you can do so with
$ vagrant ssh -c 'make -C src/github.com/weaveworks/weave'
```
you should then find a `weave.tar` container snapshot tarball in the
you should then find a `weave.tar.gz` container snapshot tarball in the
top-level directory. You can use that snapshot with `docker load`
against a different host, e.g.
```bash
$ export DOCKER_HOST=tcp://<HOST:PORT>
$ docker load < weave.tar
$ docker load < weave.tar.gz
```
You can provide extra Vagrant configuration by putting a file
+1 -1
View File
@@ -13,7 +13,7 @@ echo " prefetch test images"
setup_host() {
HOST=$1
docker_on $HOST load -i ../weave.tar
docker_on $HOST load -i ../weave.tar.gz
DANGLING_IMAGES="$(docker_on $HOST images -q -f dangling=true)"
[ -n "$DANGLING_IMAGES" ] && docker_on $HOST rmi $DANGLING_IMAGES 1>/dev/null 2>&1 || true
run_on $HOST mkdir -p bin