summaryrefslogtreecommitdiffstats
path: root/doc/functions.xml
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2018-08-27 19:54:41 -0400
committerGraham Christensen <graham@grahamc.com>2018-08-27 19:54:41 -0400
commit360f420ac7df37e8987473f49e00175ef70732b8 (patch)
tree19e33a0b869bfec1901d81010d5c6bf22d5dff5a /doc/functions.xml
parent53371b15c6f287b627e1255bb21d54e123e1f96f (diff)
nixpkgs docs: normalize
Diffstat (limited to 'doc/functions.xml')
-rw-r--r--doc/functions.xml31
1 files changed, 16 insertions, 15 deletions
diff --git a/doc/functions.xml b/doc/functions.xml
index 9bbf97c5c71e..ec188e234543 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -523,7 +523,8 @@ merge:"diff3"
<callout arearefs='ex-dockerTools-buildImage-2'>
<para>
<varname>tag</varname> specifies the tag of the resulting image. By
- default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag.
+ default it's <literal>null</literal>, which indicates that the nix output
+ hash will be used as tag.
</para>
</callout>
<callout arearefs='ex-dockerTools-buildImage-3'>
@@ -669,12 +670,12 @@ merge:"diff3"
<para>
<varname>imageDigest</varname> specifies the digest of the image to be
downloaded. Skopeo can be used to get the digest of an image, with its
- <varname>inspect</varname> subcommand. Since a given <varname>imageName</varname>
- may transparently refer to a manifest list of images which support
- multiple architectures and/or operating systems, supply the `--override-os`
- and `--override-arch` arguments to specify exactly which image you
- want. By default it will match the OS and architecture of the host the
- command is run on.
+ <varname>inspect</varname> subcommand. Since a given
+ <varname>imageName</varname> may transparently refer to a manifest list
+ of images which support multiple architectures and/or operating systems,
+ supply the `--override-os` and `--override-arch` arguments to specify
+ exactly which image you want. By default it will match the OS and
+ architecture of the host the command is run on.
<programlisting>
$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
@@ -697,16 +698,16 @@ merge:"diff3"
</para>
</callout>
<callout arearefs='ex-dockerTools-pullImage-5'>
- <para>
- <varname>os</varname>, if specified, is the operating system of the fetched image.
- By default it's <literal>linux</literal>.
- </para>
+ <para>
+ <varname>os</varname>, if specified, is the operating system of the
+ fetched image. By default it's <literal>linux</literal>.
+ </para>
</callout>
<callout arearefs='ex-dockerTools-pullImage-6'>
- <para>
- <varname>arch</varname>, if specified, is the cpu architecture of the fetched image.
- By default it's <literal>x86_64</literal>.
- </para>
+ <para>
+ <varname>arch</varname>, if specified, is the cpu architecture of the
+ fetched image. By default it's <literal>x86_64</literal>.
+ </para>
</callout>
</calloutlist>
</section>