diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:26:50 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:26:50 +0200 |
commit | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (patch) | |
tree | 4e5f80d94d7c5cd1a9b9ad5d026b26cadc148aa5 /pkgs/build-support/docker | |
parent | c778596f56c687318543e5b13af2864fdf79408d (diff) | |
parent | 1b5925f2189dc9b4ebf7168252bf89a94b7405ba (diff) | |
download | nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.tar nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.tar.gz nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.tar.bz2 nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.tar.lz nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.tar.xz nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.tar.zst nixlib-1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/docker')
-rwxr-xr-x | pkgs/build-support/docker/nix-prefetch-docker | 7 | ||||
-rwxr-xr-x | pkgs/build-support/docker/store-path-to-layer.sh | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/build-support/docker/nix-prefetch-docker index bf01384ccdb4..1b6785189c28 100755 --- a/pkgs/build-support/docker/nix-prefetch-docker +++ b/pkgs/build-support/docker/nix-prefetch-docker @@ -12,7 +12,6 @@ finalImageTag= hashType=$NIX_HASH_ALGO hashFormat=$hashFormat format=nix -skopeoCmd="skopeo --insecure-policy --tmpdir=$TMPDIR" usage(){ echo >&2 "syntax: nix-prefetch-docker [options] [IMAGE_NAME [IMAGE_TAG|IMAGE_DIGEST]] @@ -39,7 +38,7 @@ get_image_digest(){ imageTag="latest" fi - "$skopeoCmd" inspect "docker://$imageName:$imageTag" | jq '.Digest' -r + skopeo --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r } get_name() { @@ -128,9 +127,9 @@ trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)" if test -z "$QUIET"; then - "$skopeoCmd" --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" else - "$skopeoCmd" --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null fi # Compute the hash. diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index d834716e4b21..7437da51cc4a 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -30,12 +30,13 @@ mkdir -p nix/store # store path to the absolute store path. tarhash=$( basename -a "$@" | - tar -cp nix \ - -C /nix/store --verbatim-files-from --files-from - \ + tar --create --preserve-permissions --absolute-names nix \ + --directory /nix/store --verbatim-files-from --files-from - \ --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 \ - --transform 's,^nix(/|$),/nix/,' \ + --transform 's,^nix$,/\0,' \ + --transform 's,^nix/store$,/\0,' \ --transform 's,^[^/],/nix/store/\0,rS' | tee "$layerPath/layer.tar" | tarsum |