k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make intermediate bin tarball os-specific 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d6d361ee21)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/11764/head
Brad Davidson 2025-02-06 06:21:42 +00:00 committed by Brad Davidson
parent 0a2553a54c
commit 90d69bf311
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -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/

4
package/Dockerfile
View File

@ -1,8 +1,8 @@
FROM alpine:3.20 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

8
scripts/package-cli
View File

@ -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