Skip to content

Commit

Permalink
building: update guest image to fedora:40
Browse files Browse the repository at this point in the history
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
  • Loading branch information
Burning1020 committed Jul 23, 2024
1 parent af8c8d8 commit dca93a6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 22 deletions.
2 changes: 1 addition & 1 deletion vmm/scripts/image/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

exit_flag=0
export GUESTOS_IMAGE=${2:-"centos"}
export IMAGE_NAME=${IMAGE_NAME:-"centos:7"}
export IMAGE_NAME=${IMAGE_NAME:-"registry.fedoraproject.org/fedora:40"}
export ROOTFS_DIR=${ROOTFS_DIR:-"/tmp/kuasar-rootfs"}
export CONTAINER_RUNTIME=${RUNTIME:-"containerd"}
CONTAINERD_NS=${CONTAINERD_NS:-"default"}
Expand Down
11 changes: 6 additions & 5 deletions vmm/scripts/image/centos/binaries.list
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
/usr/bin/quota* /bin
/usr/bin/quotasync /bin
# cni
/usr/sbin/arping /sbin
/usr/bin/arping /sbin
/usr/bin/ping /sbin
/usr/bin/echo /bin
# iptables
/usr/sbin/iptables /sbin
/usr/sbin/iptables-restore /sbin
/usr/sbin/iptables-save /sbin
/etc/alternatives/iptables /etc/alternatives
/etc/alternatives/iptables-restore /etc/alternatives
/etc/alternatives/iptables-save /etc/alternatives
# debug
/usr/bin/ls /bin
/usr/bin/cat /bin
Expand All @@ -40,7 +40,6 @@
/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
Expand All @@ -50,4 +49,6 @@
/usr/sbin/ethtool /sbin
/usr/bin/netstat /bin
/usr/sbin/ip /sbin
/usr/sbin/busybox /bin
/usr/bin/ldd /bin
# End of file, do not delete
16 changes: 1 addition & 15 deletions vmm/scripts/image/centos/build_rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,7 @@ ARCH=$(uname -m)
make_vmm_task() {
local repo_dir="$1"

# install cmake3 because some rust modules depends on it
# centos 7 install cmake 2.8 by default, has to add epel repo to install cmake3
. /etc/os-release
if [ ${VERSION_ID} -le 7 ]; then
yum install -y epel-release
yum install -y cmake3 make gcc gcc-c++ wget
rm -f /usr/bin/cmake
ln -s /usr/bin/cmake3 /usr/bin/cmake
else
# CentOS Linux 8 had reached the End Of Life (EOL) on December 31st, 2021. It means that CentOS 8 will no longer receive development resources from the official CentOS project. After Dec 31st, 2021, if you need to update your CentOS, you need to change the mirrors to vault.centos.org where they will be archived permanently. Alternatively, you may want to upgrade to CentOS Stream.
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
yum clean all
yum install cmake make gcc-c++ wget
fi
yum install -y cmake make gcc-c++ wget

# update cert file under internal proxy scenario
if [ -f "${cert_file_path}" ]; then
Expand Down
6 changes: 5 additions & 1 deletion vmm/scripts/image/centos/rpm.list
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
nfs-utils
tcp_wrappers-libs
rpcbind
libverto-tevent
libtirpc
libtevent
libtalloc
Expand All @@ -17,11 +16,16 @@ keyutils
gssproxy
e2fsprogs-libs
libpcap
iptables-libs
iptables
ipvsadm
conntrack-tools
curl
ethtool
net-tools
iproute
busybox
psmisc
procps-ng
iputils
# End of file, do not delete

0 comments on commit dca93a6

Please sign in to comment.