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

Merge pull request #24947 from timclassic/docker-repro

Browse Source 
docker: improve reproducibility of layers
This commit is contained in:
Benjamin Staffin 2017-04-17 22:16:33 -04:00 committed by GitHub
commit 8cf393bf48
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ rec {
postMount = ''
echo "Packing raw image..."
tar -C mnt --mtime=0 -cf $out .
tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
'';
};
@ -247,7 +247,7 @@ rec {
echo "Adding contents..."
for item in $contents; do
echo "Adding $item"
rsync -ak $item/ layer/
rsync -ak --chown=0:0 $item/ layer/
done
else
echo "No contents to add to layer."
@ -260,7 +260,7 @@ rec {
# Tar up the layer and throw it into 'layer.tar'.
echo "Packing layer..."
mkdir $out
tar -C layer --mtime=0 -cf $out/layer.tar .
tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
# Compute a checksum of the tarball.
echo "Computing layer checksum..."
@ -310,7 +310,7 @@ rec {
echo "Adding contents..."
for item in ${toString contents}; do
echo "Adding $item..."
rsync -ak $item/ layer/
rsync -ak --chown=0:0 $item/ layer/
done
'';
@ -340,7 +340,7 @@ rec {
echo "Packing layer..."
mkdir $out
tar -C layer --mtime=0 -cf $out/layer.tar .
tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
# Compute the tar checksum and add it to the output json.
echo "Computing checksum..."
@ -467,7 +467,8 @@ rec {
comm <(sort -n baseFiles|uniq) \
<(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
# Append the new files to the layer.
tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles
tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 --group=0 --no-recursion --files-from newFiles
echo "Adding meta..."
@ -496,7 +497,7 @@ rec {
chmod -R a-w image
echo "Cooking the image..."
tar -C image --mtime=0 -c . | pigz -nT > $out
tar -C image --mtime="@$SOURCE_DATE_EPOCH" -c . | pigz -nT > $out
echo "Finished."
'';