public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18896 from tboettch/dockerToolsFix

Browse Source 
dockerTools: Fix layer redundancy.
This commit is contained in:
Luca Bruno 2016-09-25 15:35:05 +01:00 committed by GitHub
commit c049fd4a31
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript { stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript
, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz }: , docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz, findutils }:
# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
@ -249,7 +249,7 @@ EOF
then mkPureLayer { inherit baseJson contents extraCommands; } then mkPureLayer { inherit baseJson contents extraCommands; }
else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }); else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
result = runCommand "${baseName}.tar.gz" { result = runCommand "${baseName}.tar.gz" {
buildInputs = [ jshon pigz ]; buildInputs = [ jshon pigz coreutils findutils ];
imageName = name; imageName = name;
imageTag = tag; imageTag = tag;
@ -261,6 +261,18 @@ EOF
buildArgs = args; buildArgs = args;
}; };
} '' } ''
# Print tar contents:
# 1: Interpreted as relative to the root directory
# 2: With no trailing slashes on directories
# This is useful for ensuring that the output matches the values generated by the "find" command
ls_tar() {
for f in $(tar -tf $1 | xargs realpath -ms --relative-to=.); do
if [ "$f" != "." ]; then
echo "/$f"
fi
done
}
mkdir image mkdir image
touch baseFiles touch baseFiles
if [ -n "$fromImage" ]; then if [ -n "$fromImage" ]; then
@ -276,7 +288,7 @@ EOF
parentID=$(jshon -e $fromImageName -e $fromImageTag -u < image/repositories) parentID=$(jshon -e $fromImageName -e $fromImageTag -u < image/repositories)
for l in image/*/layer.tar; do for l in image/*/layer.tar; do
tar -tf $l >> baseFiles ls_tar $l >> baseFiles
done done
fi fi
@ -297,8 +309,7 @@ EOF
fi fi
echo Adding layer echo Adding layer
tar -tf temp/layer.tar >> baseFiles ls_tar temp/layer.tar >> baseFiles
sed 's/^\.//' -i baseFiles
comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles
tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true