Skip to content

Commit f34eedd

Browse files
committed
Add config file to let users modify config easily.
1 parent 833129f commit f34eedd

File tree

2 files changed

+43
-7
lines changed

2 files changed

+43
-7
lines changed

config

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Environment for running the application, either "prod" or "dev"
2+
#RUN_ENV=
3+
4+
# USER INFO
5+
#USERNAME=
6+
#EMAIL=
7+
#AVATAR=
8+
9+
# CORS (Seprate with comma)
10+
#ALLOWED_ORIGINS=
11+
12+
# Home Directory(Do not modify when using docker)
13+
#CODING_IDE_HOME=
14+
#SPACE_HOME=
15+
16+
# Max file size to upload (in Mb)
17+
#UPLOAD_FILE_SIZE_LIMIT=
18+

ide.sh

+25-7
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,37 @@ do_build_frontend() {
6262
cd $BASEDIR
6363
}
6464

65+
do_build_backend() {
66+
cd $BACKEND
67+
echo "mvn clean and packaging..."
68+
mvn clean package -Dmaven.test.skip=true
69+
valid_last_cmd
70+
cd $BASEDIR
71+
}
72+
6573
sub_build() {
6674

6775
build_usage() {
68-
echo "Usage: $PROG_NAME build frontend"
76+
echo "Usage: $PROG_NAME build [frontend | backend | run]"
6977
}
7078

7179
case $1 in
7280
"-h" | "--help")
7381
build_usage
7482
;;
75-
"" | "frontend")
83+
"")
84+
do_build_frontend
85+
do_build_backend
86+
;;
87+
"backend")
88+
do_build_backend
89+
;;
90+
"frontend")
7691
do_build_frontend
7792
;;
7893
"run") # build and run
7994
do_build_frontend
95+
do_build_backend
8096
do_run_backend
8197
;;
8298
esac
@@ -193,7 +209,7 @@ sub_docker() {
193209
create_dir_if_not_exist $HOME/.coding-ide-home
194210

195211
echo "creating container $CONTAINER"
196-
docker create -p 8080:8080 -v $HOME/.coding-ide-home:/home/coding/coding-ide-home --name webide -h webide webide/webide
212+
docker create -p 8080:8080 --env-file config -v $HOME/.coding-ide-home:/home/coding/coding-ide-home --name webide -h webide webide/webide
197213
valid_last_cmd
198214
elif [ "$RUNNING" == "true" ]; then
199215
echo "CRITICAL - $CONTAINER is running."
@@ -234,9 +250,11 @@ sub_docker() {
234250
}
235251

236252
do_run_backend() {
237-
cd $BACKEND
238-
mvn clean && mvn spring-boot:run ${1}
239-
cd $BASEDIR
253+
if [ ! -f $BACKEND/target/ide-backend.jar ]; then
254+
sub_build
255+
fi
256+
. $BASEDIR/config
257+
java -jar $BACKEND/target/ide-backend.jar --PTY_LIB_FOLDER=$BACKEND/src/main/resources/lib ${1}
240258
}
241259

242260
sub_run() {
@@ -250,7 +268,7 @@ sub_run() {
250268
while getopts ":p:" opt; do
251269
case $opt in
252270
p)
253-
EXTRA_VARS=-Drun.arguments="--server.port=${OPTARG}"
271+
EXTRA_VARS="--server.port=${OPTARG}"
254272
;;
255273
\?)
256274
run_usage

0 commit comments

Comments
 (0)