github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 21:39:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2511 from marcel-apf/osbuilder-fixes

Browse Source 
Osbuilder fixes
This commit is contained in:
Marcel Apfelbaum
2021-08-26 11:32:48 +03:00
committed by GitHub
parent a989238348 9de1129bf7
commit f62ea5dade
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/osbuilder/Makefile
View File

@@ -9,7 +9,7 @@ ROOTFS_BUILDER := $(MK_DIR)/rootfs-builder/rootfs.sh
INITRD_BUILDER := $(MK_DIR)/initrd-builder/initrd_builder.sh INITRD_BUILDER := $(MK_DIR)/initrd-builder/initrd_builder.sh
IMAGE_BUILDER := $(MK_DIR)/image-builder/image_builder.sh IMAGE_BUILDER := $(MK_DIR)/image-builder/image_builder.sh
DISTRO := centos DISTRO ?= centos
BUILD_METHOD := distro BUILD_METHOD := distro
BUILD_METHOD_LIST := distro dracut BUILD_METHOD_LIST := distro dracut
AGENT_INIT ?= no AGENT_INIT ?= no

6
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@@ -326,7 +326,11 @@ build_rootfs_distro()
trap error_handler ERR trap error_handler ERR
fi fi
if [ -d "${ROOTFS_DIR}" ] && [ "${ROOTFS_DIR}" != "/" ]; then
rm -rf "${ROOTFS_DIR}"/*
else
mkdir -p ${ROOTFS_DIR} mkdir -p ${ROOTFS_DIR}
fi
# need to detect rustc's version too? # need to detect rustc's version too?
detect_rust_version || detect_rust_version ||
@@ -369,6 +373,8 @@ build_rootfs_distro()
docker_run_args="" docker_run_args=""
docker_run_args+=" --rm" docker_run_args+=" --rm"
# apt sync scans all possible fds in order to close them, incredibly slow on VMs
docker_run_args+=" --ulimit nofile=262144:262144"
docker_run_args+=" --runtime ${DOCKER_RUNTIME}" docker_run_args+=" --runtime ${DOCKER_RUNTIME}"
if [ -z "${AGENT_SOURCE_BIN}" ] ; then if [ -z "${AGENT_SOURCE_BIN}" ] ; then