Fix some stuffs

This commit is contained in:
Uggla
2015-05-08 20:02:21 +02:00
parent f45250224e
commit f0d0d8341b
+7 -2
View File
@@ -2,6 +2,10 @@
# Build PA Server Image # Build PA Server Image
# Start from clean conf files
rm auth_papatcher.sh NodePAMaster_conf.json
git checkout auth_papatcher.sh NodePAMaster_conf.json
echo "Enter PA username :" echo "Enter PA username :"
read user read user
echo echo
@@ -29,7 +33,7 @@ echo
# Check inputs # Check inputs
if [ -z "$user" ]; then echo "User invalid";exit 1;fi if [ -z "$user" ]; then echo "User invalid";exit 1;fi
if [ -z "$password" ]; then echo "Password invalid";exit 1;fi if [ -z "$password" ]; then echo "Password invalid";exit 1;fi
if [ -z "$serveripaddress" ]; then serveripaddress="127.0.0.0";fi if [ -z "$serveripaddress" ]; then serveripaddress="127.0.0.1";fi
if [ -z "$servername" ]; then echo "Server name invalid";exit 1;fi if [ -z "$servername" ]; then echo "Server name invalid";exit 1;fi
if [ -z "$serverregion" ]; then echo "Server region invalid";exit 1;fi if [ -z "$serverregion" ]; then echo "Server region invalid";exit 1;fi
if [ "$serverlistonpastats" == "y" ] || [ "$serverlistonpastats" == "n" ] if [ "$serverlistonpastats" == "y" ] || [ "$serverlistonpastats" == "n" ]
@@ -47,9 +51,10 @@ sed -i "s/papassword_to_replace/$password/" auth_papatcher.sh
sed -i "s/server_name_to_replace/$servername/" NodePAMaster_conf.json sed -i "s/server_name_to_replace/$servername/" NodePAMaster_conf.json
sed -i "s/region_to_replace/$serverregion/" NodePAMaster_conf.json sed -i "s/region_to_replace/$serverregion/" NodePAMaster_conf.json
sed -i "/serverip/ s/127\.0\.0\.0/$serveripaddress/" NodePAMaster_conf.json sed -i "/serverip/ s/127\.0\.0\.1/$serveripaddress/" NodePAMaster_conf.json
sed -i "/listonpastats/ s/true/$serverlistonpastats/" NodePAMaster_conf.json sed -i "/listonpastats/ s/true/$serverlistonpastats/" NodePAMaster_conf.json
#sudo docker build --rm=true . #sudo docker build --rm=true .
sudo docker build .