nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66543 from grahamc/dt

Browse Source 
dockerTools: document extraCommands, increase layers
This commit is contained in:
Graham Christensen 2019-08-15 09:47:32 -04:00 committed by GitHub
commit ee30e62e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/functions/dockertools.xml
View File

@ -312,7 +312,23 @@ hello latest de2bf4786de6 About a minute ago 25.2MB
Maximum number of layers to create. Maximum number of layers to create.
</para> </para>
<para> <para>
<emphasis>Default:</emphasis> <literal>24</literal> <emphasis>Default:</emphasis> <literal>100</literal>
</para>
<para>
<emphasis>Maximum:</emphasis> <literal>125</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>extraCommands</varname> <emphasis>optional</emphasis>
</term>
<listitem>
<para>
Shell commands to run while building the final layer, without access
to most of the layer contents. Changes to this layer are "on top"
of all the other layers, so can create additional directories
and files.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

7
pkgs/build-support/docker/default.nix
View File

@ -291,9 +291,10 @@ rec {
# Files to add to the layer. # Files to add to the layer.
closure, closure,
configJson, configJson,
# Docker has a 42-layer maximum, we pick 24 to ensure there is plenty # Docker has a 125-layer maximum, we pick 100 to ensure there is
# of room for extension # plenty of room for extension.
maxLayers ? 24 # https://github.com/moby/moby/blob/b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5/layer/layer_store.go#L23-L26
maxLayers ? 100
}: }:
let let
storePathToLayer = substituteAll storePathToLayer = substituteAll