aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKuo-tung Kao <jelly.k@inwinstack.com>2015-10-14 16:19:45 +0800
committerKuo-tung Kao <ya790206@gmail.com>2015-10-17 10:08:03 +0800
commit52b72538114fdf3de5b71ce399bb0992d2748d75 (patch)
treefa60fd599594ef47e750de30c46cc51f407e51e7 /doc
parentbd010bdee2794990de381adf99f841ab237f58c6 (diff)
downloadkolla-52b72538114fdf3de5b71ce399bb0992d2748d75.tar.gz
kolla-52b72538114fdf3de5b71ce399bb0992d2748d75.zip
add "registry" flag to "tools/build.py"
With registry flag, build image using `tools/build.py --registry 172.22.2.81:4000` the image name looks like `172.22.2.81:4000/kollaglue/data` When user use kolla-ansible, user set `docker_registry` to `172.22.2.81:4000` in `/etc/kolla/globals.yml`. Build image using `tools/build.py -n abcd` the image name looks like `abcd/data` When user use kolla-ansible, user set `docker_namespace:` to `abcd` in `/etc/kolla/globals.yml`. build image using `tools/build.py -n abcd --registry 172.22.2.81:4000` the image name looks like `abcd/data` When user use kolla-ansible, user set `docker_namespace:` to `abcd` in `/etc/kolla/globals.yml`. user set `docker_registry` to `172.22.2.81:4000` in `/etc/kolla/globals.yml`. With the feature, it will reduce user confusing and mistaking. Change-Id: I18ac7a3ccec032888e35f5e9a79fc190760cc8a0 Closes-Bug: #1505056
Diffstat (limited to 'doc')
-rw-r--r--doc/deploy-all-in-one-node.rst2
-rw-r--r--doc/image-building.rst10
2 files changed, 5 insertions, 7 deletions
diff --git a/doc/deploy-all-in-one-node.rst b/doc/deploy-all-in-one-node.rst
index 04f62780d..b59bbb1b5 100644
--- a/doc/deploy-all-in-one-node.rst
+++ b/doc/deploy-all-in-one-node.rst
@@ -37,7 +37,7 @@ The guide assumes that you have build images using the following command.
::
- tools/build.py -n 172.22.2.81:4000/kollaglue --base ubuntu --type source --push
+ tools/build.py --registry 172.22.2.81:4000 --base ubuntu --type source --push
The IP, "172.22.2.81", is the host running private docker registry.
To deploy a private docker registry,
diff --git a/doc/image-building.rst b/doc/image-building.rst
index ee18c153d..d02c8322c 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -56,14 +56,12 @@ want to push images to your dockerhub, change the namespace like:
$ tools/build.py -n yourusername --push
-To push images to local registry, change the namespace, too. If the ip
-of the machine running local registry is ``172.22.2.81`` and the port
-which local registry listens to is ``4000``, use the following command
-to push images to local registry.
+To push images to local registry, use ``--registry`` flag like the
+following command:
::
- tools/build.py --namespace 172.22.2.81:4000/kollaglue --push
+ tools/build.py --registry 172.22.2.81:4000 --push
To trigger buid.py to pull images from local registry,
the Docker configuration needs to be modified. See
@@ -180,7 +178,7 @@ To build and push images to local registry, use the following command:
::
- tools/build.py --namespace 172.22.2.81:4000/kollaglue --push
+ tools/build.py --registry 172.22.2.81:4000 --push
Kolla-ansible with Local Registry
+++++++++++++++++++++++++++++++++