mirror of
https://github.com/rancher/os.git
synced 2025-04-27 19:15:23 +00:00
Build script updates
Always compress with gzip unless we are doing a release. Also download rootfs.tar to ${DOWNLOAD} so `dapper -m bind` works better.
This commit is contained in:
parent
b6ddb4f577
commit
2a60981b09
@ -209,8 +209,8 @@ RUN source /usr/src/toolchain-env; if [ "${TOOLCHAIN}" != "" ]; then \
|
||||
make install \
|
||||
;fi
|
||||
|
||||
RUN mkdir -p images/00-rootfs/build && \
|
||||
curl -pfL ${!OS_BASE_URL} | tar xvJf - -C images/00-rootfs/build
|
||||
RUN cd ${DOWNLOADS} && \
|
||||
curl -pfL ${!OS_BASE_URL} | tar xvJf -
|
||||
|
||||
ENTRYPOINT ["./scripts/entry"]
|
||||
CMD ["ci"]
|
||||
|
9
images/00-rootfs/prebuild.sh
Executable file
9
images/00-rootfs/prebuild.sh
Executable file
@ -0,0 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
TAR=${DOWNLOADS}/rootfs.tar
|
||||
|
||||
if [ -e $TAR ]; then
|
||||
cd $(dirname $0)
|
||||
mkdir -p build
|
||||
cp $TAR build
|
||||
fi
|
@ -6,4 +6,4 @@ cd $(dirname $0)
|
||||
|
||||
./build
|
||||
./prepare
|
||||
INSTALLER=0 COMPRESS="gzip -1" ROOTFS=0 ./package
|
||||
INSTALLER=0 ROOTFS=0 ./package
|
||||
|
@ -11,7 +11,7 @@ INITRD=${ARTIFACTS}/initrd
|
||||
mkdir -p ${ARTIFACTS}
|
||||
|
||||
if [ "$COMPRESS" == "" ]; then
|
||||
COMPRESS=lzma
|
||||
COMPRESS="gzip -1"
|
||||
fi
|
||||
|
||||
cd ${INITRD_DIR}
|
||||
|
@ -3,5 +3,6 @@ set -e
|
||||
|
||||
source $(dirname $0)/version
|
||||
export REPO_VERSION=$VERSION
|
||||
export COMPRESS=lzma
|
||||
|
||||
exec $(dirname $0)/ci
|
||||
|
Loading…
Reference in New Issue
Block a user