blob: 56de8fbff4bb01ca433ae2406ec96f5122d16fba (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From 25acc29f24442e17bf40272a2dc68f429341b431 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sat, 23 Dec 2023 02:12:21 +0100
Subject: [PATCH 6/6] scripts: moar compression, drop pigz and raw tar
---
scripts/package-airgap | 20 ++++++++++++++------
scripts/package-cli | 9 +++++----
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/scripts/package-airgap b/scripts/package-airgap
index d5588e904b..c939669399 100755
--- a/scripts/package-airgap
+++ b/scripts/package-airgap
@@ -20,10 +20,18 @@ if [ -n "${OPT_ARCH}" ]; then
fi
fi
+xargs=(xargs)
+if [[ -t 0 && -t 1 && -t 2 ]]; then
+ xargs+=(-o)
+fi
+
airgap_image_file='scripts/airgap/image-list.txt'
-images=$(cat "${airgap_image_file}")
-xargs -n1 docker pull ${OPT_PLATFORM} <<< "${images}"
-docker save ${images} ${OPT_PLATFORM} -o dist/artifacts/k3s-airgap-images-${ARCH}.tar
-zstd --no-progress -T0 -16 -f --long=25 dist/artifacts/k3s-airgap-images-${ARCH}.tar -o dist/artifacts/k3s-airgap-images-${ARCH}.tar.zst
-pigz -v -c dist/artifacts/k3s-airgap-images-${ARCH}.tar > dist/artifacts/k3s-airgap-images-${ARCH}.tar.gz
-sha256sum dist/artifacts/k3s-airgap-images-${ARCH}.tar* | sed 's|dist/artifacts/||' > dist/artifacts/k3s-airgap-images-${ARCH}.sha256sum
+airgap_tar_file="dist/artifacts/k3s-airgap-images-${ARCH}.tar"
+readarray -t images <"${airgap_image_file}"
+printf '%s\0' "${images[@]}" | "${xargs[@]}" -0 -t -n1 docker pull ${OPT_PLATFORM}
+docker save "${images[@]}" ${OPT_PLATFORM} -o "${airgap_tar_file}"
+zstd -T0 --ultra -22 --long --verbose --force --rm "${airgap_tar_file}"
+(
+cd "${airgap_tar_file%/*}"
+sha256sum "${airgap_tar_file##*/}"* > "${airgap_tar_file##*/}.sha256sum"
+)
diff --git a/scripts/package-cli b/scripts/package-cli
index fbdc3463e6..6c89fec818 100755
--- a/scripts/package-cli
+++ b/scripts/package-cli
@@ -54,11 +54,12 @@ mkdir -p ./etc
set -x
)
-tar cvf ./build/out/data-${OS}.tar ./bin ./etc
-zstd --no-progress -T0 -16 -f --long=25 --rm ./build/out/data-${OS}.tar -o ./build/out/data-${OS}.tar.zst
-HASH=$(sha256sum ./build/out/data-${OS}.tar.zst | awk '{print $1}')
+data_tar_file="./build/out/data-${OS}.tar"
+tar cvf "${data_tar_file}" ./bin ./etc
+zstd -T0 --ultra -22 --long --verbose --force --rm "${data_tar_file}"
+HASH=$(sha256sum "${data_tar_file}.zst" | awk '{print $1}')
-cp ./build/out/data-${OS}.tar.zst ./build/data/${HASH}.tar.zst
+cp "${data_tar_file}.zst" ./build/data/${HASH}.tar.zst
BIN_SUFFIX="-${ARCH}"
if [ ${ARCH} = amd64 ]; then
--
2.52.0.5.g6c3c29cc24e
|