switch dockerhub user from zettio to weaveworks
This commit is contained in:
1 parent
04d0cd33e6
commit
cbe73e7645
4 files changed
+5
-5
No files matched your search
@@ -6,7 +6,7 @@ PUBLISH=publish_weave publish_weavedns publish_weaveexec
|
|||||||
# If you can use docker without being root, you can do "make SUDO="
|
# If you can use docker without being root, you can do "make SUDO="
|
||||||
SUDO=sudo
|
SUDO=sudo
|
||||||
|
|
||||||
DOCKERHUB_USER=zettio
|
DOCKERHUB_USER=weaveworks
|
||||||
WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD)
|
WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD)
|
||||||
WEAVER_EXE=weaver/weaver
|
WEAVER_EXE=weaver/weaver
|
||||||
WEAVEDNS_EXE=weavedns/weavedns
|
WEAVEDNS_EXE=weavedns/weavedns
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ set -e
|
|||||||
|
|
||||||
SUDO=${SUDO-sudo}
|
SUDO=${SUDO-sudo}
|
||||||
GITHUB_USER=${GITHUB_USER:-weaveworks}
|
GITHUB_USER=${GITHUB_USER:-weaveworks}
|
||||||
DOCKERHUB_USER=${DOCKERHUB_USER:-zettio}
|
DOCKERHUB_USER=${DOCKERHUB_USER:-weaveworks}
|
||||||
RELEASE_NAME=${RELEASE_NAME:-"Weave"}
|
RELEASE_NAME=${RELEASE_NAME:-"Weave"}
|
||||||
RELEASE_DESCRIPTION=${RELEASE_DESCRIPTION:-"Weaving Containers into Applications"}
|
RELEASE_DESCRIPTION=${RELEASE_DESCRIPTION:-"Weaving Containers into Applications"}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -54,8 +54,8 @@ $ make
|
|||||||
```
|
```
|
||||||
|
|
||||||
This will build the weave components and package them into three
|
This will build the weave components and package them into three
|
||||||
Docker images (`zettio/weave`, `zettio/weavedns`, and
|
Docker images (`weaveworks/weave`, `weaveworks/weavedns`, and
|
||||||
`zettio/weaveexec`). These are then exported (as `weave.tar`,
|
`weaveworks/weaveexec`). These are then exported (as `weave.tar`,
|
||||||
`weavedns.tar` and `weaveexec.tar`).
|
`weavedns.tar` and `weaveexec.tar`).
|
||||||
|
|
||||||
## Building in a Docker container
|
## Building in a Docker container
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
|
|||||||
|
|
||||||
# These are potentially used for remote execs, and have defaults, so
|
# These are potentially used for remote execs, and have defaults, so
|
||||||
# we introduce them here
|
# we introduce them here
|
||||||
DOCKERHUB_USER=zettio
|
DOCKERHUB_USER=weaveworks
|
||||||
BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
|
BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
|
||||||
EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
|
EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
|
||||||
PROCFS=${PROCFS:-/proc}
|
PROCFS=${PROCFS:-/proc}
|
||||||
|
|||||||
Reference in new issue
Block a user