diff options
| author | Linus Heckemann <git@sphalerite.org> | 2019-02-18 17:15:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 17:15:20 +0100 |
| commit | 01dacc84d41b49c481aca7df608b7f5dc14f07b2 (patch) | |
| tree | a5d77f7a28cc5854573603ad9fc88ab0b7c87242 /pkgs/build-support | |
| parent | 107215c1d0cf485de1e15b58404e732e9e58148a (diff) | |
| parent | da7cd82ab1a7c4134425dbdc91c98b9f0a69abc6 (diff) | |
Merge pull request #55859 from nlewo/dockerTools-fix-55290
dockerTools.buildImage: preserve layers ordering at image repacking
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 83ff846db7ab..f59900ab7596 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -776,7 +776,7 @@ rec { imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") - for layerTar in $(cat ./layer-list); do + for layerTar in $(tac ./layer-list); do layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1) imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .") imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") |