rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Restore the missing initrd artifact.

Browse Source 
This reverts only the path-related changes in b3a9893.
This commit is contained in:
gizmotronic
2017-02-02 13:42:03 -06:00
parent 47491c7e41
commit 015deae38c
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/integration-test
View File

@@ -10,7 +10,7 @@ source $(dirname $0)/version
cd $(dirname $0)/../tests cd $(dirname $0)/../tests
if [ ! -e "$INITRD" ]; then if [ ! -e "../dist/artifacts/$INITRD" ]; then
../scripts/dev ../scripts/dev
fi fi

6
scripts/package-initrd
View File

@@ -22,6 +22,6 @@ fi
cd ${INITRD_DIR} cd ${INITRD_DIR}
echo Creating ${INITRD} echo Creating ${ARTIFACTS}/${INITRD}
find | cpio -H newc -o | ${COMPRESS} > ${INITRD} find | cpio -H newc -o | ${COMPRESS} > ${ARTIFACTS}/${INITRD}
echo Done creating ${INITRD} echo Done creating ${ARTIFACTS}/${INITRD}

15
scripts/package-installer
View File

@@ -7,9 +7,10 @@ source ./scripts/version
BASEDOCKERFILE=./scripts/installer/BaseDockerfile.${ARCH} BASEDOCKERFILE=./scripts/installer/BaseDockerfile.${ARCH}
DOCKERFILE=./scripts/installer/Dockerfile.${ARCH} DOCKERFILE=./scripts/installer/Dockerfile.${ARCH}
ARTIFACTS=./dist/artifacts
if [ ! -f $DOCKERFILE ] || [ ! -f dist/artifacts/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${INITRD} ]; then if [ ! -f $DOCKERFILE ] || [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${ARTIFACTS}/${INITRD} ]; then
echo "Skipping package-installer due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} or ${INITRD} not found" echo "Skipping package-installer due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} or ${ARTIFACTS}/${INITRD} not found"
exit 0 exit 0
fi fi
@@ -35,11 +36,11 @@ docker build \
--build-arg KERNEL_VERSION=${KERNEL_VERSION} \ --build-arg KERNEL_VERSION=${KERNEL_VERSION} \
-f $BASEDOCKERFILE \ -f $BASEDOCKERFILE \
./scripts/installer ./scripts/installer
docker save -o dist/artifacts/installer.tar ${OS_REPO}/os-installer docker save -o ${ARTIFACTS}/installer.tar ${OS_REPO}/os-installer
cp $DOCKERFILE dist/artifacts/ cp $DOCKERFILE ${ARTIFACTS}/
cp ${INITRD} ./scripts/installer/build/boot cp ${ARTIFACTS}/${INITRD} ./scripts/installer/build/boot
cp ./dist/artifacts/vmlinuz-${KERNEL_VERSION} ./scripts/installer/build/boot cp ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ./scripts/installer/build/boot
cp -r ${DIST}/boot/* ./scripts/installer/build/boot cp -r ${DIST}/boot/* ./scripts/installer/build/boot
cp $DOCKERFILE ./scripts/installer/build/Dockerfile cp $DOCKERFILE ./scripts/installer/build/Dockerfile
# Full installer image with initrd - used for pulling from network # Full installer image with initrd - used for pulling from network
@@ -47,6 +48,6 @@ docker build \
-t ${OS_REPO}/os:${VERSION}${SUFFIX} \ -t ${OS_REPO}/os:${VERSION}${SUFFIX} \
./scripts/installer/build ./scripts/installer/build
docker save -o dist/artifacts/fullinstaller.tar ${OS_REPO}/os:${VERSION}${SUFFIX} docker save -o ${ARTIFACTS}/fullinstaller.tar ${OS_REPO}/os:${VERSION}${SUFFIX}
echo ${OS_REPO}/os:${VERSION}${SUFFIX} >> dist/images echo ${OS_REPO}/os:${VERSION}${SUFFIX} >> dist/images
echo Built ${OS_REPO}/os:${VERSION}${SUFFIX} echo Built ${OS_REPO}/os:${VERSION}${SUFFIX}

6
scripts/package-iso
View File

@@ -13,12 +13,12 @@ CHECKSUM=iso-checksums.txt
mkdir -p ${CD}/boot/isolinux mkdir -p ${CD}/boot/isolinux
mkdir -p ${CD}/rancheros mkdir -p ${CD}/rancheros
if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${INITRD} ]; then if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${ARTIFACTS}/${INITRD} ]; then
echo "Skipping package-iso due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} or ${INITRD} not found" echo "Skipping package-iso due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} or ${ARTIFACTS}/${INITRD} not found"
exit 0 exit 0
fi fi
cp ${INITRD} ${CD}/boot cp ${ARTIFACTS}/${INITRD} ${CD}/boot
# TODO: these move to os-kernel # TODO: these move to os-kernel
pwd pwd

2
scripts/version
View File

@@ -15,7 +15,7 @@ if [ -z "$VERSION" ]; then
fi fi
fi fi
INITRD=${ARTIFACTS}/initrd-${VERSION} INITRD=initrd-${VERSION}
export VERSION COMMIT INITRD export VERSION COMMIT INITRD
# Suffix # Suffix