From 3090282a15b8ea94a610218e862a104d03e310f7 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 8 Jan 2015 19:15:28 +0000 Subject: [PATCH] permit overriding of dockerhub user --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index addb6d82..4fc0eec6 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,14 @@ # If you can use docker without being root, you can do "make SUDO=" SUDO=sudo +DOCKERHUB_USER=zettio WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD) WEAVER_EXE=weaver/weaver WEAVEDNS_EXE=weavedns/weavedns WEAVETOOLS_EXES=tools/bin -WEAVER_IMAGE=zettio/weave -WEAVEDNS_IMAGE=zettio/weavedns -WEAVETOOLS_IMAGE=zettio/weavetools +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