Make intermediate bin tarball os-specific

Signed-off-by: Brad Davidson <[email protected]>

.gitignore

@@ -21,7 +21,7 @@
 /image/go_build_agent
 /image/main.squashfs
 /package/k3s
-/package/data.tar.zst
+/package/data-*
 /pkg/data/zz_generated_bindata.go
 __pycache__
 /tests/.pytest_cache/

package/Dockerfile

@@ -1,8 +1,8 @@
 FROM alpine:3.21 as base
 RUN apk add -U ca-certificates zstd tzdata
-COPY build/out/data.tar.zst /
+COPY build/out/data-linux.tar.zst /
 RUN mkdir -p /image/etc/ssl/certs /image/run /image/var/run /image/tmp /image/lib/modules /image/lib/firmware && \
-    zstdcat -d /data.tar.zst | tar -xa -C /image && \
+    zstdcat -d /data-linux.tar.zst | tar -xa -C /image && \
     echo "root:x:0:0:root:/:/bin/sh" > /image/etc/passwd && \
     echo "root:x:0:" > /image/etc/group && \
     cp /etc/ssl/certs/ca-certificates.crt /image/etc/ssl/certs/ca-certificates.crt

scripts/package-cli

@@ -54,11 +54,11 @@ mkdir -p ./etc
     set -x
 )
 
-tar cvf ./build/out/data.tar ./bin ./etc
-zstd --no-progress -T0 -16 -f --long=25 --rm ./build/out/data.tar -o ./build/out/data.tar.zst
-HASH=$(sha256sum ./build/out/data.tar.zst | awk '{print $1}')
+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}')
 
-cp ./build/out/data.tar.zst ./build/data/${HASH}.tar.zst
+cp ./build/out/data-${OS}.tar.zst ./build/data/${HASH}.tar.zst
 
 BIN_SUFFIX="-${ARCH}"
 if [ ${ARCH} = amd64 ]; then