dockerTools.buildLayeredImage: store all paths passed in final layer

Fixes #78744

My previous change broke when there are more packages than the maximum
number of layers. I had assumed that the `store-path-to-layer.sh` was
only ever passed a single store path, but that is not the case if
there are multiple packages going into the final layer. To fix this, we
loop through the paths going into the final layer, appending them to the
tar file and making sure they end up at the right path.

This commit is contained in:

Richard Wallace

2020-02-14 09:26:26 +01:00

committed by

Antoine Eiche

parent 8979d2dde5

commit 3b65b3f6d6

2 changed files with 11 additions and 11 deletions

									
										pkgs/build-support/docker/examples.nix
									
		+1
		
												View File
												
				@@ -246,4 +246,5 @@ rec {

				    contents = [ pkgs.bash pkgs.hello ];

				    maxLayers = 2;

				  };

				}