Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: add some commands and make build.sh independent #133

Merged
merged 1 commit into from
Apr 9, 2024
Merged

build: add some commands and make build.sh independent #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ bin/vmlinux.bin:
@mkdir -p bin && cp vmm/scripts/kernel/${HYPERVISOR}/vmlinux.bin bin/vmlinux.bin && rm vmm/scripts/kernel/${HYPERVISOR}/vmlinux.bin

bin/kuasar.img:
@bash vmm/scripts/image/${GUESTOS_IMAGE}/build.sh image
@bash vmm/scripts/image/build.sh image ${GUESTOS_IMAGE}
@mkdir -p bin && cp /tmp/kuasar.img bin/kuasar.img && rm /tmp/kuasar.img

bin/kuasar.initrd:
@bash vmm/scripts/image/${GUESTOS_IMAGE}/build.sh initrd
@bash vmm/scripts/image/build.sh initrd ${GUESTOS_IMAGE}
@mkdir -p bin && cp /tmp/kuasar.initrd bin/kuasar.initrd && rm /tmp/kuasar.initrd

bin/wasm-sandboxer:
Expand Down
9 changes: 5 additions & 4 deletions vmm/scripts/image/centos/build.sh → vmm/scripts/image/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# limitations under the License.

exit_flag=0
export GUESTOS_IMAGE=${2:-"centos"}
export IMAGE_NAME=${IMAGE_NAME:-"centos:7"}
export ROOTFS_DIR=${ROOTFS_DIR:-"/tmp/kuasar-rootfs"}
export CONTAINER_RUNTIME=${RUNTIME:-"containerd"}
Expand All @@ -40,7 +41,7 @@ echo "build in ${IMAGE_NAME}"

if [ ! -n "${REPO_DIR}" ]; then
current_dir=$(dirname "$(readlink -f "$0")")
pushd ${current_dir}/../../../..
pushd ${current_dir}/../../..
REPO_DIR=$(pwd)
popd
fi
Expand Down Expand Up @@ -68,7 +69,7 @@ containerd)
--mount type=bind,src="${ROOTFS_DIR}",dst=/tmp/kuasar-rootfs,options=rbind:rw \
${IMAGE_NAME} \
${container_name} \
bash /kuasar/vmm/scripts/image/centos/build_rootfs.sh
bash /kuasar/vmm/scripts/image/${GUESTOS_IMAGE}/build_rootfs.sh
fn_check_result $? "ctr run ${container_name} return error!"
;;
docker)
Expand All @@ -80,7 +81,7 @@ docker)
-v "${REPO_DIR}":/kuasar \
-v "${ROOTFS_DIR}":"/tmp/kuasar-rootfs" \
${IMAGE_NAME} \
bash /kuasar/vmm/scripts/image/centos/build_rootfs.sh
bash /kuasar/vmm/scripts/image/${GUESTOS_IMAGE}/build_rootfs.sh
fn_check_result $? "docker run ${container_name} return error!"
;;
isulad)
Expand All @@ -93,7 +94,7 @@ isulad)
-v "${REPO_DIR}":/kuasar \
-v "${ROOTFS_DIR}":"/tmp/kuasar-rootfs" \
${IMAGE_NAME} \
bash /kuasar/vmm/scripts/image/centos/build_rootfs.sh
bash /kuasar/vmm/scripts/image/${GUESTOS_IMAGE}/build_rootfs.sh
fn_check_result $? "isula run ${container_name} return error!"
;;
*)
Expand Down
19 changes: 19 additions & 0 deletions vmm/scripts/image/centos/binaries.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
/usr/bin/sh /bin
# procps-ng
/usr/bin/ps /bin
/usr/bin/kill /bin
/usr/bin/free /bin
/usr/bin/top /bin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How much will these binaries add to the total image size?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approximately 1~2M, the total size of image file in still 128M,

# kmod
/usr/sbin/modprobe /sbin
/usr/sbin/depmod /sbin
Expand All @@ -23,6 +26,7 @@
/usr/bin/quotasync /bin
# cni
/usr/sbin/arping /sbin
/usr/bin/ping /sbin
/usr/bin/echo /bin
# iptables
/usr/sbin/iptables /sbin
Expand All @@ -32,3 +36,18 @@
/usr/bin/ls /bin
/usr/bin/cat /bin
/usr/bin/cp /bin
/usr/bin/mv /bin
/usr/bin/rm /bin
/usr/bin/mkdir /bin
/usr/bin/find /bin
/usr/bin/awk /bin
/usr/bin/grep /bin
/usr/bin/chmod /bin
/usr/bin/chown /bin
/usr/bin/dmesg /bin
/usr/bin/ln /bin
/usr/bin/curl /bin
/usr/sbin/ethtool /sbin
/usr/bin/netstat /bin
/usr/sbin/ip /sbin
# End of file, do not delete
13 changes: 7 additions & 6 deletions vmm/scripts/image/centos/build_rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,19 @@ install_and_copy_rpm() {
yum install -y $rpm >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Can not install $rpm by yum"
exit 1
continue
fi
rpm -ql $rpm >/dev/null 2>&1 || continue
fi
array=($(rpm -ql $rpm | grep -v "share" | grep -v ".build-id"))
for file in ${array[@]}; do
source=$file
dts_file=${rootfs_dir}$file
dts_folder=${dts_file%/*}
if [ ! -d "$dts_folder" ]; then
mkdir -p $dts_folder
dst_file=${rootfs_dir}$file
dst_folder=${dst_file%/*}
if [ ! -d "$dst_folder" ] && [ ! -L "$dst_folder" ]; then
mkdir -p $dst_folder
fi
cp -r -f -d $source $dts_folder
cp -r -f -d $source $dst_folder
done
fi
done
Expand Down
5 changes: 5 additions & 0 deletions vmm/scripts/image/centos/rpm.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ libpcap
iptables
ipvsadm
conntrack-tools
curl
ethtool
net-tools
iproute
# End of file, do not delete
Loading