fix: [install] force virtual environmemt activation

pull/559/head
Terrtia 2020-06-17 15:39:24 +02:00
parent 41cacf7129
commit f15e240499
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 10 additions and 6 deletions

View File

@ -16,10 +16,12 @@ if [ -z "$VIRTUAL_ENV" ]; then
echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate
echo export AIL_ARDB=$(pwd)/ardb/src/ >> ./AILENV/bin/activate
. ./AILENV/bin/activate
fi
# activate virtual environment
. ./AILENV/bin/activate
pip3 install -U pip
pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client'
pip3 install -U -r requirements.txt

View File

@ -88,16 +88,18 @@ fi
# create AILENV + intall python packages
./install_virtualenv.sh
# force virtual environment
. ./AILENV/bin/activate
pushd ${AIL_BIN}helper/gen_cert
pushd ${AIL_BIN}/helper/gen_cert
./gen_root.sh
wait
./gen_cert.sh
wait
popd
cp ${AIL_BIN}helper/gen_cert/server.crt ${AIL_FLASK}server.crt
cp ${AIL_BIN}helper/gen_cert/server.key ${AIL_FLASK}server.key
cp ${AIL_BIN}/helper/gen_cert/server.crt ${AIL_FLASK}server.crt
cp ${AIL_BIN}/helper/gen_cert/server.key ${AIL_FLASK}server.key
mkdir -p $AIL_HOME/PASTES
@ -116,7 +118,7 @@ git describe --abbrev=0 --tags
popd
# LAUNCH ARDB
bash ${AIL_BIN}LAUNCH.sh -lav &
bash ${AIL_BIN}/LAUNCH.sh -lav &
wait
echo ""
@ -125,6 +127,6 @@ pushd ${AIL_FLASK}
python3 create_default_user.py
popd
bash ${AIL_BIN}LAUNCH.sh -k &
bash ${AIL_BIN}/LAUNCH.sh -k &
wait
echo ""