Skip to content

K
k3s
Commit d6d361ee authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Make intermediate bin tarball os-specific

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 5c8f2364
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
.gitignore
View file @ d6d361ee
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/image/go_build_agent /image/go_build_agent
/image/main.squashfs /image/main.squashfs
/package/k3s /package/k3s
/package/data.tar.zst /package/data-*
/pkg/data/zz_generated_bindata.go /pkg/data/zz_generated_bindata.go
__pycache__ __pycache__
/tests/.pytest_cache/ /tests/.pytest_cache/
......
package/Dockerfile
View file @ d6d361ee
FROM alpine:3.21 as base FROM alpine:3.21 as base
RUN apk add -U ca-certificates zstd tzdata 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 && \ 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:0:root:/:/bin/sh" > /image/etc/passwd && \
echo "root:x:0:" > /image/etc/group && \ echo "root:x:0:" > /image/etc/group && \
cp /etc/ssl/certs/ca-certificates.crt /image/etc/ssl/certs/ca-certificates.crt cp /etc/ssl/certs/ca-certificates.crt /image/etc/ssl/certs/ca-certificates.crt
......
scripts/package-cli
View file @ d6d361ee
...@@ -54,11 +54,11 @@ mkdir -p ./etc ...@@ -54,11 +54,11 @@ mkdir -p ./etc
set -x set -x
) )
tar cvf ./build/out/data.tar ./bin ./etc tar cvf ./build/out/data-${OS}.tar ./bin ./etc
zstd --no-progress -T0 -16 -f --long=25 --rm ./build/out/data.tar -o ./build/out/data.tar.zst 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.tar.zst | awk '{print $1}') 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}" BIN_SUFFIX="-${ARCH}"
if [ ${ARCH} = amd64 ]; then if [ ${ARCH} = amd64 ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment