diff options
| author | Antoine Eiche <lewo@abesis.fr> | 2017-07-25 11:24:49 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-07-26 20:01:41 +0200 |
| commit | 0a4c43065c5fe4bd599399c02321bb6dd39421af (patch) | |
| tree | 20b10328cb4cc8071bb3bdf3afdab7be2c16f96f /pkgs/build-support/docker | |
| parent | 9be26f81caf167f32c6af5cb876f48d7fad7d2c3 (diff) | |
| download | nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.tar nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.tar.gz nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.tar.bz2 nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.tar.lz nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.tar.xz nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.tar.zst nixlib-0a4c43065c5fe4bd599399c02321bb6dd39421af.zip | |
docker: do not import configuration and manifest from the base image
Fix #27632.
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 0d02897da74a..0c85941b6a17 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -435,6 +435,9 @@ rec { if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." tar -C image -xpf "$fromImage" + # Do not import the base image configuration and manifest + rm -f image/*.json + rm -f image/manifest.json if [[ -z "$fromImageName" ]]; then fromImageName=$(jshon -k < image/repositories|head -n1) |