diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c795b05 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..b41fe47 --- /dev/null +++ b/build.sh @@ -0,0 +1,34 @@ +SERVER_DIR=~/p/SelfSurvey-server +FE_DIR=~/p/SelfSurvey-FE +CONFIG_DIR=~/p/selfsurvey-config +SERVER_PUBLIC_ADDR=survey.austinwhoover.com + +# make build folder structure +rm -rf $CONFIG_DIR/build +mkdir $CONFIG_DIR/build +# setup BE repo stuff +rm -rf $SERVER_DIR/src/main/resources/static +mkdir $SERVER_DIR/src/main/resources/static +# assemble FE +cd $FE_DIR +npx webpack --env apiurl=http://$SERVER_PUBLIC_ADDR +cd $SERVER_DIR/src/main/resources/static +rm -rf ./* +cp -r $FE_DIR/dist/* $SERVER_DIR/src/main/resources/static/ +# assemble BE +cd $SERVER_DIR +mvn clean package +# assemble package +cp $SERVER_DIR/target/self-survey.war $CONFIG_DIR/build/ROOT.war +cp $CONFIG_DIR/docker-compose.yml $CONFIG_DIR/build/docker-compose.yml + +echo "COMPLETED!" +echo "docker-compose.yml should be straightforward" +echo "ROOT.war goes in /webapps/" +echo "must touch the file /db/selfsurvey.db if it doesn't already exist!" +echo "config file goes in \"," +echo " \"password\": \"\"" +echo " }" \ No newline at end of file diff --git a/test.sh b/test.sh index c99547d..74096b4 100644 --- a/test.sh +++ b/test.sh @@ -1,14 +1,16 @@ + + # assemble FE -cd ~/p/self-survey-fe +cd ~/p/SelfSurvey-FE npm run build -cd ~/p/SelfSurvey-server-master/src/main/resources/static +cd ~/p/SelfSurvey-server/src/main/resources/static rm -rf ./* -cp -r ~/p/self-survey-fe/dist/* ~/p/SelfSurvey-server-master/src/main/resources/static/ +cp -r ~/p/SelfSurvey-FE/dist/* ~/p/SelfSurvey-server/src/main/resources/static/ # assemble BE -cd ~/p/SelfSurvey-server-master/ +cd ~/p/SelfSurvey-server/ mvn clean package cd ~/Documents/apache-tomcat-9.0.89/webapps/ rm -rf ./ROOT.war ./ROOT -cp ~/p/SelfSurvey-server-master/target/self-survey.war ~/Documents/apache-tomcat-9.0.89/webapps/ROOT.war +cp ~/p/SelfSurvey-server/target/self-survey.war ~/Documents/apache-tomcat-9.0.89/webapps/ROOT.war cd ~/Documents/apache-tomcat-9.0.89/bin/ ./catalina.sh run \ No newline at end of file