summary refs log tree commit diff
path: root/doc/builders/images
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2021-03-23 18:15:34 -0400
committerGitHub <noreply@github.com>2021-03-23 18:15:34 -0400
commit561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b (patch)
treed5ec5bdeaeffd677521f0ea50149da6620fc88ca /doc/builders/images
parent5361b4b7cce7cfc17439657d6446029ec82a4d6a (diff)
parentaae8588182913549435332d0ac120e18d7afdab5 (diff)
downloadnixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.tar
nixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.tar.gz
nixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.tar.bz2
nixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.tar.lz
nixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.tar.xz
nixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.tar.zst
nixpkgs-561cc81ee6b2ae2c17bc88b45a4e6be9ec388d0b.zip
Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image
dockerTools.buildLayeredImage: support fromImage
Diffstat (limited to 'doc/builders/images')
-rw-r--r--doc/builders/images/dockertools.section.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md
index 40d4dba1b85..23662f9bbfe 100644
--- a/doc/builders/images/dockertools.section.md
+++ b/doc/builders/images/dockertools.section.md
@@ -111,6 +111,12 @@ Create a Docker image with many of the store paths being on their own layer to i
 
     *Default:* the output path's hash
 
+`fromImage` _optional_
+
+: The repository tarball containing the base image. It must be a valid Docker image, such as one exported by `docker save`.
+
+    *Default:* `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`.
+
 `contents` _optional_
 
 : Top level paths in the container. Either a single derivation, or a list of derivations.