git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #55859 from nlewo/dockerTools-fix-55290

dockerTools.buildImage: preserve layers ordering at image repacking

commit01dacc84d41b49c481aca7df608b7f5dc14f07b2 authorLinus Heckemann <git@sphalerite.org> dateMon 18 Feb 2019, 17:15 (8 years ago) parent107215cda7cd82
1 file changed+1−1
pkgs/build-support/docker/default.nix+1−1
pkgs/build-support/docker/default.nix+1−1
@@ -776,7 +776,7 @@ rec {
776776 imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
777777 manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
778778
779− for layerTar in $(cat ./layer-list); do
779+ for layerTar in $(tac ./layer-list); do
780780 layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
781781 imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
782782 imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")