mirror of
https://github.com/rancher/os.git
synced 2025-07-30 22:24:33 +00:00
Build script updates
This commit is contained in:
parent
29c6aac571
commit
ac0f317bf8
@ -10,6 +10,10 @@ CD=${BUILD}/cd
|
||||
mkdir -p ${CD}/boot/isolinux
|
||||
mkdir -p ${CD}/boot/isolinux
|
||||
|
||||
if [ ! -x ${ARTIFACTS}/vmlinuz ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cp ${ARTIFACTS}/initrd ${CD}/boot
|
||||
cp ${ARTIFACTS}/vmlinuz ${CD}/boot
|
||||
cp scripts/isolinux.cfg ${CD}/boot/isolinux
|
||||
|
@ -1,8 +1,11 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
set -o pipefail
|
||||
|
||||
cd $(dirname $0)/..
|
||||
|
||||
source scripts/version
|
||||
|
||||
BUILD=$(pwd)/build
|
||||
IMAGE_CACHE=${BUILD}/image-cache
|
||||
PREPOP_DIR=${IMAGE_CACHE}/var/lib/system-docker
|
||||
@ -12,7 +15,12 @@ INITRD=${ARTIFACTS}/initrd
|
||||
|
||||
mkdir -p ${ARTIFACTS} ${PREPOP_DIR}
|
||||
|
||||
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX})
|
||||
if [ "$(docker info | grep 'Storage Driver: ' | sed 's/Storage Driver: //')" != "overlay" ]; then
|
||||
echo Overlay storage driver is require do create rootfs.tar 1>&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX} ${DFS_ARGS})
|
||||
trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT
|
||||
docker exec -i ${DFS} docker load < ${INITRD_DIR}/usr/share/ros/images.tar
|
||||
docker stop ${DFS}
|
||||
|
Loading…
Reference in New Issue
Block a user