maxjhandsome
/
sysom1
mirror of https://gitee.com/anolis/sysom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move rpm install into 0_env 

use "python3 -m venv" instead of virtualenv-3 command,
because of some yum repos have not virtualenv-3 command

Signed-off-by: huangtuq <tuquanhuang@linux.alibaba.com>
This commit is contained in:
huangtuq 2022-11-30 10:14:28 +08:00
parent 1dd736c206
commit 3adeb274bf
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
script/server/0_env/init.sh
View File

@ -37,27 +37,28 @@ check_selinux_status()
fi
}
touch_virtualenv() {
mkdir -p ~/.pip
cp pip.conf ~/.pip/
if [ -d ${VIRTUALENV_HOME} ]; then
echo "virtualenv exists, skip"
else
virtualenv-3 ${VIRTUALENV_HOME}
if [ "$?" = 0 ]; then
echo "INFO: create virtualenv success"
else
echo "ERROR: create virtualenv failed"
exit 1
touch_env_rpms() {
if [ -f /etc/alios-release ]; then
if [ ! -f /etc/yum.repos.d/epel.repo ]; then
wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo
fi
elif [ -f /etc/anolis-release ]; then
sed -i '/epel\/8\/Everything/{n;s/enabled=0/enabled=1/;}' /etc/yum.repos.d/AnolisOS-DDE.repo
fi
echo "INFO: activate virtualenv..."
source ${VIRTUALENV_HOME}/bin/activate || exit 1
rpm -q --quiet python3 || yum install -y python3
rpm -q --quiet mariadb-server || yum install -y mariadb-server
rpm -q --quiet supervisor || yum install -y supervisor
rpm -q --quiet nginx || yum install -y nginx
rpm -q --quiet gcc || yum install -y gcc
rpm -q --quiet make || yum install -y make
rpm -q --quiet redis || yum install -y redis
rpm -q --quiet wget || yum install -y wget
rpm -q --quiet rpcbind || yum install -y rpcbind
rpm -q --quiet nfs-utils || yum install -y nfs-utils
}
check_requirements() {
echo "INFO: begin install requirements..."
if ! [ -d ${SERVER_HOME}/logs/ ]; then
mkdir -p ${SERVER_HOME}/logs/ || exit 1
fi
@ -66,6 +67,7 @@ check_requirements() {
local requirements="requirements.txt"
touch "$requirements_log" || exit
### atomic-0.7.3 need cffi, we show install cffi first###
pip install --upgrade pip
pip install cffi
pip install -r ${requirements} -i "${ALIYUN_MIRROR}" |tee -a "${requirements_log}" || exit 1
local pip_res=$?
@ -75,6 +77,27 @@ check_requirements() {
fi
}
touch_virtualenv() {
if [ -d ${VIRTUALENV_HOME} ]; then
echo "virtualenv exists, skip"
echo "INFO: activate virtualenv..."
source ${VIRTUALENV_HOME}/bin/activate || exit 1
else
mkdir -p ~/.pip
cp pip.conf ~/.pip/
python3 -m venv ${VIRTUALENV_HOME}
if [ "$?" = 0 ]; then
echo "INFO: create virtualenv success"
else
echo "ERROR: create virtualenv failed"
exit 1
fi
echo "INFO: activate virtualenv..."
source ${VIRTUALENV_HOME}/bin/activate || exit 1
check_requirements
fi
}
install_sdk() {
pushd ${TARGET_PATH}/${SDK_DIR}
python setup_cec_base.py develop
@ -86,8 +109,8 @@ install_sdk() {
deploy() {
check_selinux_status
touch_env_rpms
touch_virtualenv
check_requirements
install_sdk
}

22
tools/deploy/deploy.sh
View File

@ -58,28 +58,6 @@ fi
mkdir -p ${SERVER_HOME}
touch_env_rpms() {
if [ -f /etc/alios-release ]; then
if [ ! -f /etc/yum.repos.d/epel.repo ]; then
wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo
fi
elif [ -f /etc/anolis-release ]; then
sed -i '/epel\/8\/Everything/{n;s/enabled=0/enabled=1/;}' /etc/yum.repos.d/AnolisOS-DDE.repo
fi
rpm -q --quiet python3 || yum install -y python3
rpm -q --quiet python3-virtualenv || yum install -y python3-virtualenv
rpm -q --quiet mariadb-server || yum install -y mariadb-server
rpm -q --quiet supervisor || yum install -y supervisor
rpm -q --quiet nginx || yum install -y nginx
rpm -q --quiet gcc || yum install -y gcc
rpm -q --quiet make || yum install -y make
rpm -q --quiet redis || yum install -y redis
rpm -q --quiet wget || yum install -y wget
rpm -q --quiet rpcbind || yum install -y rpcbind
rpm -q --quiet nfs-utils || yum install -y nfs-utils
rpm -q --quiet python3-pip || yum install -y python3-pip
}
update_target() {
if [ -d "${TARGET_PATH}" ]; then
rm -rf ${TARGET_PATH}