diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 1ce0e21c..38f937a1 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -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"] diff --git a/images/00-rootfs/prebuild.sh b/images/00-rootfs/prebuild.sh new file mode 100755 index 00000000..ef96a1ac --- /dev/null +++ b/images/00-rootfs/prebuild.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +TAR=${DOWNLOADS}/rootfs.tar + +if [ -e $TAR ]; then + cd $(dirname $0) + mkdir -p build + cp $TAR build +fi diff --git a/scripts/dev b/scripts/dev index 237ff112..0caad111 100755 --- a/scripts/dev +++ b/scripts/dev @@ -6,4 +6,4 @@ cd $(dirname $0) ./build ./prepare -INSTALLER=0 COMPRESS="gzip -1" ROOTFS=0 ./package +INSTALLER=0 ROOTFS=0 ./package diff --git a/scripts/package-initrd b/scripts/package-initrd index 84a6c84b..5c2050f0 100755 --- a/scripts/package-initrd +++ b/scripts/package-initrd @@ -11,7 +11,7 @@ INITRD=${ARTIFACTS}/initrd mkdir -p ${ARTIFACTS} if [ "$COMPRESS" == "" ]; then - COMPRESS=lzma + COMPRESS="gzip -1" fi cd ${INITRD_DIR} diff --git a/scripts/release b/scripts/release index 8a3676fc..ee10a0b6 100755 --- a/scripts/release +++ b/scripts/release @@ -3,5 +3,6 @@ set -e source $(dirname $0)/version export REPO_VERSION=$VERSION +export COMPRESS=lzma exec $(dirname $0)/ci