From 2ccb83cee19425ca081a0c106b097ec3da861ed0 Mon Sep 17 00:00:00 2001
From: Suhail Syed <suhsyed@cisco.com>
Date: Thu, 18 Feb 2016 17:36:59 -0500
Subject: [PATCH] Refined documentation regarding registry
The documentation had old information about running
docker registry version 1. Documentation improvement
uses exclusively Docker register version 2.
TrivialFix
Change-Id: I320341c1a646eeeec35fb928a970f4d7e8a13bb9
---
doc/quickstart.rst | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 3e943ba48..81fb2f010 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -252,42 +252,23 @@ to pull from the Docker Hub to get images. Kolla can function with
or without a local registry, however for a multinode deployment a registry
is required.
-Currently, the Docker registry v2 has extremely bad performance
+The Docker registry prior to version 2.3 has extremely bad performance
because all container data is pushed for every image rather than taking
advantage of Docker layering to optimize push operations. For more
information reference
`pokey registry <https://github.com/docker/docker/issues/14018>`__.
-There are two ways to set up a local docker registry. Either use packages
-or pull the registry container from the Docker Hub. The packaged Docker
-registry is v1 and the container is v2. For CentOS, the Docker registry v1
-is a good alternative while Docker works to solve the v2 github issue
-mentioned above. Unfortunately, not all distributions package
-docker-registry. Note that the v1 registry can be run from Docker containers
-by using the registry:latest tag. However, the current latest tag is broken
-and crashes on startup. Therefore, on Centos use the follow operations
-to start the docker-registry v1:
-
-::
-
- # CentOS
-
- yum install docker-registry
- sed -i "s/REGISTRY_PORT=5000/REGISTRY_PORT=4000/g" /etc/sysconfig/docker-registry
- systemctl daemon-reload
- systemctl enable docker-registry
- systemctl start docker-registry
-
-If not using CentOS or Docker registry version 2 is desired, run the following
-command:
+The Kolla community recommends using registry 2.3 or later. To deploy
+registry 2.3 do the following:
::
docker run -d -p 4000:5000 --restart=always --name registry registry:2
-Note: Kolla looks for the Docker registry to use port 4000. (Docker default is port 5000)
+Note: Kolla looks for the Docker registry to use port 4000. (Docker default
+is port 5000)
-After enabling the registry, it is necessary to instruct docker that it will
+After enabling the registry, it is necessary to instruct Docker that it will
be communicating with an insecure registry. To enable insecure registry
communication on CentOS, modify the "/etc/sysconfig/docker" file to contain
the following where 192.168.1.100 is the IP address of the machine where the
--
GitLab