From e1c07dce3fdfda33eae19e612d7463e19117dad3 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 11 Jun 2015 11:50:55 +0100 Subject: [PATCH] permit overriding of DOCKERHUB_USER which in turn enables operation from private registries Closes #887. --- weave | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weave b/weave index 0383ac6b..59fa8f30 100755 --- a/weave +++ b/weave @@ -11,9 +11,8 @@ else fi IMAGE_VERSION=${VERSION:-$IMAGE_VERSION} -# These are potentially used for remote execs, and have defaults, so -# we introduce them here -DOCKERHUB_USER=weaveworks +# These are needed for remote execs, hence we introduce them here +DOCKERHUB_USER=${DOCKERHUB_USER:-weaveworks} BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION PROXY_HOST=${PROXY_HOST:-$(echo "${DOCKER_HOST#tcp://}" | cut -s -d: -f1)} @@ -65,6 +64,7 @@ exec_remote() { -v /var/run/docker.sock:/var/run/docker.sock \ -v /proc:/hostproc \ -e PROCFS=/hostproc \ + -e DOCKERHUB_USER="$DOCKERHUB_USER" \ -e VERSION \ -e WEAVE_DEBUG \ -e WEAVE_DOCKER_ARGS \