File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,8 @@ export version="$1"
6
6
db=${2:- install}
7
7
phpversion=" ${3} "
8
8
9
+ MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:- root}
10
+
9
11
# If this script is called from unit-tests.sh, we use the test environment
10
12
export APP_ENV=" ${3:- prod} "
11
13
@@ -83,11 +85,11 @@ section_end
83
85
84
86
if [ " ${db} " = " install" ]; then
85
87
section_start " Install DOMjudge database"
86
- /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot bare-install
88
+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -p ${MYSQL_ROOT_PASSWORD} bare-install
87
89
section_end
88
90
elif [ " ${db} " = " upgrade" ]; then
89
91
section_start " Upgrade DOMjudge database"
90
- /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
92
+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -p ${MYSQL_ROOT_PASSWORD} upgrade
91
93
section_end
92
94
fi
93
95
@@ -129,7 +131,7 @@ if [ "${db}" = "install" ]; then
129
131
# Make sure admin has no team associated so we will not insert submissions during unit tests.
130
132
mysql_root " UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
131
133
fi
132
- /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a " $ARTIFACTS /mysql.txt"
134
+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -p ${MYSQL_ROOT_PASSWORD} install-examples | tee -a " $ARTIFACTS /mysql.txt"
133
135
section_end
134
136
fi
135
137
You can’t perform that action at this time.
0 commit comments