diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-07 12:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-07 12:01:23 +0000 |
commit | 312ad6d25c2d55d52aae84445173f746ce8b8541 (patch) | |
tree | 9c7ed46fbb343d46890fa4eaf2f8e7cd68cfc742 /doc | |
parent | 1fc760419dd067b0747f934957e901a40d1c4ce4 (diff) | |
parent | 96d99daa655abb015e013dfb94afe8aca600954a (diff) |
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r-- | doc/builders/images/dockertools.section.md | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index d7f8741437cc9..2a41d48cf1340 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -20,7 +20,12 @@ buildImage { fromImageName = null; fromImageTag = "latest"; - contents = pkgs.redis; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + paths = [ pkgs.redis ]; + pathsToLink = [ "/bin" ]; + }; + runAsRoot = '' #!${pkgs.runtimeShell} mkdir -p /data @@ -46,7 +51,7 @@ The above example will build a Docker image `redis/latest` from the given base i - `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's `null`, in which case `buildImage` will peek the first tag available for the base image. -- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`. +- `copyToRoot` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`. - `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`. @@ -81,7 +86,11 @@ pkgs.dockerTools.buildImage { name = "hello"; tag = "latest"; created = "now"; - contents = pkgs.hello; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + paths = [ pkgs.hello ]; + pathsToLink = [ "/bin" ]; + }; config.Cmd = [ "/bin/hello" ]; } |