james/nixery
1
0
Fork 0
mirror of https://code.tvl.fyi/depot.git:/tools/nixery.git synced 2025-03-15 14:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(build-image): Minor tweak to layer construction script

Browse Source
This commit is contained in:
Vincent Ambo 2019-09-22 17:45:44 +01:00 committed by Vincent Ambo
parent 924a4b2d3b
commit a1648c077d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-image/build-image.nix
View File

@ -179,7 +179,7 @@ let
# The server application compares binary MD5 hashes and expects base64 # The server application compares binary MD5 hashes and expects base64
# encoding instead of hex. # encoding instead of hex.
layerMd5=$(openssl dgst -md5 -binary $layer | openssl enc -base64) layerMd5=$(openssl dgst -md5 -binary $layer | openssl enc -base64)
layerSize=$(wc -c $layer | cut -d ' ' -f1) layerSize=$(stat --printf '%s' $layer)
jq -n -c --arg sha256 $layerSha256 --arg md5 $layerMd5 --arg size $layerSize --arg path $layer \ jq -n -c --arg sha256 $layerSha256 --arg md5 $layerMd5 --arg size $layerSize --arg path $layer \
'{ size: ($size | tonumber), sha256: $sha256, md5: $md5, path: $path }' >> fs-layers '{ size: ($size | tonumber), sha256: $sha256, md5: $md5, path: $path }' >> fs-layers
@ -203,7 +203,7 @@ let
configMetadata = fromJSON (readFile (runCommand "config-meta" { configMetadata = fromJSON (readFile (runCommand "config-meta" {
buildInputs = with pkgs; [ jq openssl ]; buildInputs = with pkgs; [ jq openssl ];
} '' } ''
size=$(wc -c ${configJson} | cut -d ' ' -f1) size=$(stat --printf '%s' ${configJson})
sha256=$(sha256sum ${configJson} | cut -d ' ' -f1) sha256=$(sha256sum ${configJson} | cut -d ' ' -f1)
md5=$(openssl dgst -md5 -binary ${configJson} | openssl enc -base64) md5=$(openssl dgst -md5 -binary ${configJson} | openssl enc -base64)
jq -n -c --arg size $size --arg sha256 $sha256 --arg md5 $md5 \ jq -n -c --arg size $size --arg sha256 $sha256 --arg md5 $md5 \