mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
docker: do not import configuration and manifest from the base image
Fix #27632.
This commit is contained in:
parent
9be26f81ca
commit
0a4c43065c
|
@ -435,6 +435,9 @@ rec {
|
||||||
if [[ -n "$fromImage" ]]; then
|
if [[ -n "$fromImage" ]]; then
|
||||||
echo "Unpacking base image..."
|
echo "Unpacking base image..."
|
||||||
tar -C image -xpf "$fromImage"
|
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
|
if [[ -z "$fromImageName" ]]; then
|
||||||
fromImageName=$(jshon -k < image/repositories|head -n1)
|
fromImageName=$(jshon -k < image/repositories|head -n1)
|
||||||
|
|
Loading…
Reference in a new issue