diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
| commit | de0af30716493d647e369f434008a67999ed9e28 (patch) | |
| tree | 2fda05ead70be669e4325e0d661aaafd5d04d3c0 /doc | |
| parent | 2ecb6b4574399cf710f09061357ae59526743a05 (diff) | |
| parent | 4f8f5732fc1a24329cbe5f7eb9dcb7599e282a0c (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'doc')
| -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 5a350a23e0ad4..7d250824f785b 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> |