public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dockertools: tarsum: turn in to a buildInput

Browse Source
This commit is contained in:
Graham Christensen 2018-09-25 13:54:45 -04:00
parent 725b57ba11
commit 2bf0ee3b2b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/build-support/docker/default.nix
View File

@ -77,7 +77,9 @@ rec {
ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build go build
cp tarsum $out mkdir -p $out/bin
cp tarsum $out/bin/
''; '';
# buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
@ -287,7 +289,7 @@ rec {
}: }:
runCommand "docker-layer-${name}" { runCommand "docker-layer-${name}" {
inherit baseJson contents extraCommands; inherit baseJson contents extraCommands;
buildInputs = [ jshon rsync ]; buildInputs = [ jshon rsync tarsum ];
} }
'' ''
mkdir layer mkdir layer
@ -314,11 +316,11 @@ rec {
# Compute a checksum of the tarball. # Compute a checksum of the tarball.
echo "Computing layer checksum..." echo "Computing layer checksum..."
tarsum=$(${tarsum} < $out/layer.tar) tarhash=$(tarsum < $out/layer.tar)
# Add a 'checksum' field to the JSON, with the value set to the # Add a 'checksum' field to the JSON, with the value set to the
# checksum of the tarball. # checksum of the tarball.
cat ${baseJson} | jshon -s "$tarsum" -i checksum > $out/json cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json
# Indicate to docker that we're using schema version 1.0. # Indicate to docker that we're using schema version 1.0.
echo -n "1.0" > $out/VERSION echo -n "1.0" > $out/VERSION
@ -402,8 +404,8 @@ rec {
# Compute the tar checksum and add it to the output json. # Compute the tar checksum and add it to the output json.
echo "Computing checksum..." echo "Computing checksum..."
ts=$(${tarsum} < $out/layer.tar) tarhash=$(${tarsum}/bin/tarsum < $out/layer.tar)
cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json
# Indicate to docker that we're using schema version 1.0. # Indicate to docker that we're using schema version 1.0.
echo -n "1.0" > $out/VERSION echo -n "1.0" > $out/VERSION