1
0
mirror of https://github.com/rancher/os.git synced 2025-08-01 23:17:50 +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:
Darren Shepherd 2016-06-17 07:59:11 -07:00
parent b6ddb4f577
commit 2a60981b09
5 changed files with 14 additions and 4 deletions

View File

@ -209,8 +209,8 @@ RUN source /usr/src/toolchain-env; if [ "${TOOLCHAIN}" != "" ]; then \
make install \ make install \
;fi ;fi
RUN mkdir -p images/00-rootfs/build && \ RUN cd ${DOWNLOADS} && \
curl -pfL ${!OS_BASE_URL} | tar xvJf - -C images/00-rootfs/build curl -pfL ${!OS_BASE_URL} | tar xvJf -
ENTRYPOINT ["./scripts/entry"] ENTRYPOINT ["./scripts/entry"]
CMD ["ci"] CMD ["ci"]

9
images/00-rootfs/prebuild.sh Executable file
View 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

View File

@ -6,4 +6,4 @@ cd $(dirname $0)
./build ./build
./prepare ./prepare
INSTALLER=0 COMPRESS="gzip -1" ROOTFS=0 ./package INSTALLER=0 ROOTFS=0 ./package

View File

@ -11,7 +11,7 @@ INITRD=${ARTIFACTS}/initrd
mkdir -p ${ARTIFACTS} mkdir -p ${ARTIFACTS}
if [ "$COMPRESS" == "" ]; then if [ "$COMPRESS" == "" ]; then
COMPRESS=lzma COMPRESS="gzip -1"
fi fi
cd ${INITRD_DIR} cd ${INITRD_DIR}

View File

@ -3,5 +3,6 @@ set -e
source $(dirname $0)/version source $(dirname $0)/version
export REPO_VERSION=$VERSION export REPO_VERSION=$VERSION
export COMPRESS=lzma
exec $(dirname $0)/ci exec $(dirname $0)/ci