summary refs log tree commit diff
path: root/pkgs/build-support/docker/examples.nix
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2021-12-03 00:20:44 +0100
committerGitHub <noreply@github.com>2021-12-03 00:20:44 +0100
commit66c19d856bb4eece4dce7f35787126dd67274acd (patch)
tree1af5cef5b3c00ab766d2e00e9ba4407c4820c3f6 /pkgs/build-support/docker/examples.nix
parentf55e8bf2c4211218086528ba175c76ab91631824 (diff)
parentd0bcc212de13b1cd876bb8f01c90a8e8f42e25b6 (diff)
downloadnixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar
nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.gz
nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.bz2
nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.lz
nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.xz
nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.zst
nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.zip
Merge pull request #148341 from hercules-ci/add-dockerTools-customization-layer-dependencies
dockerTools: Add store dependencies of the customization layer
Diffstat (limited to 'pkgs/build-support/docker/examples.nix')
-rw-r--r--pkgs/build-support/docker/examples.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 141c2ba0ea4..bef0c584869 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -350,6 +350,9 @@ rec {
       # This removes sharing of busybox and is not recommended. We do this
       # to make the example suitable as a test case with working binaries.
       cp -r ${pkgs.pkgsStatic.busybox}/* .
+
+      # This is a "build" dependency that will not appear in the image
+      ${pkgs.hello}/bin/hello
     '';
   };
 
@@ -504,6 +507,11 @@ rec {
     fakeRootCommands = ''
       mkdir -p ./home/jane
       chown 1000 ./home/jane
+      ln -s ${pkgs.hello.overrideAttrs (o: {
+        # A unique `hello` to make sure that it isn't included via another mechanism by accident.
+        configureFlags = o.configureFlags or "" + " --program-prefix=layeredImageWithFakeRootCommands-";
+        doCheck = false;
+      })} ./hello
     '';
   };