diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-11 13:54:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-11 13:54:31 +0000 |
| commit | 302658210ee5f6e293dd116642346fb8ee7e5caf (patch) | |
| tree | fdae21e26c17039271d88f2c6af92bc56538df83 | |
| parent | e3ab26e484361f9dc496135482ea46da6ff2d856 (diff) | |
| parent | 19b0defb9220ff55e16f857dd6741b7e16a44bc7 (diff) | |
| download | kolla-302658210ee5f6e293dd116642346fb8ee7e5caf.tar.gz kolla-302658210ee5f6e293dd116642346fb8ee7e5caf.zip | |
Merge "Configure local registries to proxy docker hub"
| -rw-r--r-- | doc/multinode.rst | 4 | ||||
| -rwxr-xr-x | tools/start-registry | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/multinode.rst b/doc/multinode.rst index 24938edaf..b88a248ff 100644 --- a/doc/multinode.rst +++ b/doc/multinode.rst @@ -35,6 +35,10 @@ Configure Docker on all nodes .. note:: As the subtitle for this section implies, these steps should be applied to all nodes, not just the deployment node. +The ``start-registry`` script configures a docker registry that proxies Kolla +images from Docker Hub, and can also be used with custom built images (see +:doc:`image-building`). + After starting 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 diff --git a/tools/start-registry b/tools/start-registry index 7c29e13a1..cb9715149 100755 --- a/tools/start-registry +++ b/tools/start-registry @@ -5,4 +5,5 @@ docker run -d \ --restart=always \ -p 5000:5000 \ -v registry:/var/lib/registry \ + -e REGISTRY_PROXY_REMOTEURL=https://registry-1.docker.io \ registry:2 |