mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 06:21:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(build_image): move upload calls to build_library

Browse Source 
This will let the image building code upload extra data without the
wrapper script having to know about it.
This commit is contained in:
Michael Marineau 2014-06-08 14:44:37 -04:00
parent bb6a18fbb8
commit 388220cfad
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_image
View File

@ -151,17 +151,14 @@ fi
if [[ "${DEV_IMAGE}" -eq 1 ]]; then if [[ "${DEV_IMAGE}" -eq 1 ]]; then
create_dev_image ${COREOS_DEVELOPER_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group} create_dev_image ${COREOS_DEVELOPER_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group}
upload_image "${BUILD_DIR}/${COREOS_DEVELOPER_IMAGE_NAME}"
fi fi
if [[ "${CONTAINER}" -eq 1 ]]; then if [[ "${CONTAINER}" -eq 1 ]]; then
create_dev_image "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" create_dev_image "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}"
upload_image "${BUILD_DIR}/${OREOS_DEVELOPER_CONTAINER_NAME}"
fi fi
if [[ "${PROD_IMAGE}" -eq 1 ]]; then if [[ "${PROD_IMAGE}" -eq 1 ]]; then
create_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group} create_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group}
upload_image "${BUILD_DIR}/${COREOS_PRODUCTION_IMAGE_NAME}"
if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then
generate_update "${COREOS_PRODUCTION_IMAGE_NAME}" ${DISK_LAYOUT} generate_update "${COREOS_PRODUCTION_IMAGE_NAME}" ${DISK_LAYOUT}
fi fi

2
build_library/dev_image_util.sh
View File

@ -93,4 +93,6 @@ EOF
systemd_enable "${root_fs_dir}" "local-fs.target" "remount-usr.service" systemd_enable "${root_fs_dir}" "local-fs.target" "remount-usr.service"
finish_image "${disk_layout}" "${root_fs_dir}" finish_image "${disk_layout}" "${root_fs_dir}"
upload_image -d "${BUILD_DIR}/${image_name}.bz2.DIGESTS" \
"${BUILD_DIR}/${image_name}"
} }

3
build_library/prod_image_util.sh
View File

@ -76,4 +76,7 @@ EOF
"${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \ "${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \
tune --disable2fs_rw "${BUILD_DIR}/${image_name}" "USR-A" tune --disable2fs_rw "${BUILD_DIR}/${image_name}" "USR-A"
fi fi
upload_image -d "${BUILD_DIR}/${image_name}.bz2.DIGESTS" \
"${BUILD_DIR}/${image_name}"
} }