Skip to content

Commit 6ef20a6

Browse files
committed
[build images] Use age binary instead of npm package
1 parent fc2ef96 commit 6ef20a6

File tree

5 files changed

+29
-38
lines changed

5 files changed

+29
-38
lines changed

scripts/age-encrypt.mjs

Lines changed: 0 additions & 21 deletions
This file was deleted.

scripts/bootstrap.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,17 @@ download_file() {
195195
print "$file_tmp_path"
196196
}
197197

198+
# path=$(download_and_verify_file URL sha256)
199+
download_and_verify_file() {
200+
file_url="$1"
201+
hash="$2"
202+
203+
path=$(download_file "$file_url")
204+
execute sh -c 'echo "'"$hash $path"'" | sha256sum -c' >/dev/null 2>&1
205+
206+
print "$path"
207+
}
208+
198209
append_to_profile() {
199210
content="$1"
200211
profiles=".profile .zprofile .bash_profile .bashrc .zshrc"
@@ -1340,6 +1351,21 @@ configure_core_dumps() {
13401351
# load the new configuration
13411352
execute_sudo sysctl -p "$sysctl_file"
13421353

1354+
# install age for encryption
1355+
age_tarball=""
1356+
case "$arch" in
1357+
x64)
1358+
age_tarball="$(download_and_verify_file https://github.com/FiloSottile/age/releases/download/v1.2.1/age-v1.2.1-linux-amd64.tar.gz 7df45a6cc87d4da11cc03a539a7470c15b1041ab2b396af088fe9990f7c79d50)"
1359+
;;
1360+
aarch64)
1361+
age_tarball="$(download_and_verify_file https://github.com/FiloSottile/age/releases/download/v1.2.1/age-v1.2.1-linux-arm64.tar.gz 57fd79a7ece5fe501f351b9dd51a82fbee1ea8db65a8839db17f5c080245e99f)"
1362+
;;
1363+
esac
1364+
1365+
age_extract_dir="$(create_tmp_directory)"
1366+
execute tar -C "$age_extract_dir" -zxf "$age_tarball" age/age
1367+
execute_sudo mv "$age_extract_dir/age/age" /usr/local/bin/age
1368+
13431369
case "$distro" in
13441370
alpine)
13451371
# we need GNU tar (instead of busybox) so we can use its sparse file support

scripts/runner.node.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,15 +482,15 @@ async function runTests() {
482482
const outfileName = "bun-cores.tar.gz.age";
483483
const outfileAbs = join(outdir, outfileName);
484484

485+
const ageRecipient = "age1eunsrgxwjjpzr48hm0y98cw2vn5zefjagt4r0qj4503jg2nxedqqkmz6fu";
486+
485487
const zipAndEncrypt = await spawnSafe({
486488
command: "sh",
487489
args: [
488490
"-c",
489491
// tar -S: handle sparse files efficiently
490-
'set -euo pipefail && tar -Sc *.core | gzip -6 | node "$0" > "$1"',
492+
`set -euo pipefail && tar -Sc *.core | gzip -6 | age -e -r ${ageRecipient} -o "$0"`,
491493
// $0
492-
join(import.meta.dirname, "age-encrypt.mjs"),
493-
// $1
494494
outfileAbs,
495495
],
496496
cwd: coresDir,

test/bun.lock

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"@swc/core": "1.3.38",
2323
"@testing-library/jest-dom": "6.6.3",
2424
"@testing-library/react": "16.1.0",
25-
"age-encryption": "0.2.1",
2625
"astro": "5.5.5",
2726
"aws-cdk-lib": "2.148.0",
2827
"axios": "1.6.8",
@@ -447,12 +446,6 @@
447446

448447
"@nestjs/core": ["@nestjs/[email protected]", "", { "dependencies": { "@nuxt/opencollective": "0.4.1", "fast-safe-stringify": "2.1.1", "iterare": "1.2.1", "path-to-regexp": "8.2.0", "tslib": "2.8.1", "uid": "2.0.2" }, "peerDependencies": { "@nestjs/common": "^11.0.0", "@nestjs/microservices": "^11.0.0", "@nestjs/platform-express": "^11.0.0", "@nestjs/websockets": "^11.0.0", "reflect-metadata": "^0.1.12 || ^0.2.0", "rxjs": "^7.1.0" }, "optionalPeers": ["@nestjs/microservices", "@nestjs/platform-express", "@nestjs/websockets"] }, "sha512-6UoVHpwa23HJxMNtuTXQCiqx/NHTG3lRBRgnZ8EDHTjgaNnR7P+xBS68zN3gLH7rBIrhhQ5Q1hVs7WswRxrw7Q=="],
449448

450-
"@noble/ciphers": ["@noble/[email protected]", "", {}, "sha512-rONPWMC7PeExE077uLE4oqWrZ1IvAfz3oH9LibVAcVCopJiA9R62uavnbEzdkVmJYI6M6Zgkbeb07+tWjlq2XA=="],
451-
452-
"@noble/curves": ["@noble/[email protected]", "", { "dependencies": { "@noble/hashes": "1.7.2" } }, "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g=="],
453-
454-
"@noble/hashes": ["@noble/[email protected]", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],
455-
456449
"@nodelib/fs.scandir": ["@nodelib/[email protected]", "", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],
457450

458451
"@nodelib/fs.stat": ["@nodelib/[email protected]", "", {}, "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="],
@@ -595,8 +588,6 @@
595588

596589
"@rollup/rollup-win32-x64-msvc": ["@rollup/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-eAhItDX9yQtZVM3yvXS/VR3qPqcnXvnLyx1pLXl4JzyNMBNO3KC986t/iAg2zcMzpAp9JSvxB5VZGnBiNoA98w=="],
597590

598-
"@scure/base": ["@scure/[email protected]", "", {}, "sha512-5Yy9czTO47mqz+/J8GM6GIId4umdCk1wc1q8rKERQulIoc8VP9pzDcghv10Tl2E7R96ZUx/PhND3ESYUQX8NuQ=="],
599-
600591
"@shikijs/core": ["@shikijs/[email protected]", "", { "dependencies": { "@shikijs/types": "3.2.1", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.5" } }, "sha512-FhsdxMWYu/C11sFisEp7FMGBtX/OSSbnXZDMBhGuUDBNTdsoZlMSgQv5f90rwvzWAdWIW6VobD+G3IrazxA6dQ=="],
601592

602593
"@shikijs/engine-javascript": ["@shikijs/[email protected]", "", { "dependencies": { "@shikijs/types": "3.2.1", "@shikijs/vscode-textmate": "^10.0.2", "oniguruma-to-es": "^4.1.0" } }, "sha512-eMdcUzN3FMQYxOmRf2rmU8frikzoSHbQDFH2hIuXsrMO+IBOCI9BeeRkCiBkcLDHeRKbOCtYMJK3D6U32ooU9Q=="],
@@ -843,8 +834,6 @@
843834

844835
"acorn-walk": ["[email protected]", "", { "dependencies": { "acorn": "^8.11.0" } }, "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw=="],
845836

846-
"age-encryption": ["[email protected]", "", { "dependencies": { "@noble/ciphers": "^1.2.0", "@noble/curves": "^1.3.0", "@noble/hashes": "^1.3.3", "@scure/base": "^1.1.5" } }, "sha512-EGiFGUoXi02A16tgXTGPi5wt3osmNbjrT7uPAEXs1NxAMFdklW/LWJ5dPx88ZEJF/kRF9zIWDBQoN4ArOjNM8w=="],
847-
848837
"agent-base": ["[email protected]", "", { "dependencies": { "debug": "^4.3.4" } }, "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA=="],
849838

850839
"agentkeepalive": ["[email protected]", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="],
@@ -2765,8 +2754,6 @@
27652754

27662755
"@nestjs/core/tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
27672756

2768-
"@noble/curves/@noble/hashes": ["@noble/[email protected]", "", {}, "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ=="],
2769-
27702757
"@npmcli/agent/https-proxy-agent": ["[email protected]", "", { "dependencies": { "agent-base": "^7.0.2", "debug": "4" } }, "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg=="],
27712758

27722759
"@npmcli/agent/lru-cache": ["[email protected]", "", {}, "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ=="],

test/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@swc/core": "1.3.38",
2828
"@testing-library/jest-dom": "6.6.3",
2929
"@testing-library/react": "16.1.0",
30-
"age-encryption": "0.2.1",
3130
"astro": "5.5.5",
3231
"aws-cdk-lib": "2.148.0",
3332
"axios": "1.6.8",

0 commit comments

Comments
 (0)