diff options
| author | Arthur Noel <arthur@0compute.net> | 2016-01-27 19:48:04 +0000 |
|---|---|---|
| committer | Arthur Noel <arthur@0compute.net> | 2016-01-27 21:13:07 +0000 |
| commit | 903129f770307954936c85fb5f8b0645540922b7 (patch) | |
| tree | 4a8e01456dd1f2a56552a2a5babfe98690c0cd6e /doc/functions.xml | |
| parent | 189693327bf8373ebc436f318aa56099b5180fbb (diff) | |
dockerTools: private registry support
* authorization token is optional
* registry url is taken from X-Docker-Endpoints header
* pull.sh correctly resumes partial layer downloads
* detjson.py does not fail on missing keys
Diffstat (limited to 'doc/functions.xml')
| -rw-r--r-- | doc/functions.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 5a350a23e0ad..7d250824f785 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -489,7 +489,6 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; <co xml:id='ex-dockerTools-pullImage-4' /> indexUrl = "https://index.docker.io"; <co xml:id='ex-dockerTools-pullImage-5' /> - registryUrl = "https://registry-1.docker.io"; registryVersion = "v1"; } </programlisting> @@ -534,8 +533,8 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> <callout arearefs='ex-dockerTools-pullImage-5'> <para> - In the above example the default values are shown for the variables <varname>indexUrl</varname>, - <varname>registryUrl</varname> and <varname>registryVersion</varname>. + In the above example the default values are shown for the variables + <varname>indexUrl</varname> and <varname>registryVersion</varname>. Hence by default the Docker.io registry is used to pull the images. </para> </callout> |