diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
| commit | 024407bf9adeadc115eeeb3fdf8dba166ea17d7c (patch) | |
| tree | 0f28c316cea0b7aa95bb15a0df90077415721d71 /pkgs/build-support/docker | |
| parent | bce12effa7f4279d057acf437e7fdcafefd16557 (diff) | |
| parent | 390ed4a626211fb7d19fb8da7661c8e3b42c4795 (diff) | |
| download | nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.gz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.bz2 nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.lz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.xz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.zst nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
Diffstat (limited to 'pkgs/build-support/docker')
| -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 372c567a7e7..ef17a3f4e58 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -783,7 +783,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\"] + .") |