File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed
Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ alias section_end='trace_off ; section_end_internal '
1919
2020export version=" $1 "
2121
22+ MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:- root}
23+
2224set -eux
2325
2426section_start " Update packages"
@@ -85,11 +87,11 @@ section_end
8587
8688if [ " ${db} " = " install" ]; then
8789 section_start " Install DOMjudge database"
88- /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot bare-install
90+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -p ${MYSQL_ROOT_PASSWORD} bare-install
8991 section_end
9092elif [ " ${db} " = " upgrade" ]; then
9193 section_start " Upgrade DOMjudge database"
92- /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
94+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -p ${MYSQL_ROOT_PASSWORD} upgrade
9395 section_end
9496fi
9597
@@ -125,9 +127,11 @@ for service in nginx php${PHPVERSION}-fpm; do
125127done
126128section_end
127129
128- section_start " Install the example data"
129- /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples
130- section_end
130+ if [ " ${db} " = " install" ]; then
131+ section_start " Install the example data"
132+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} install-examples | tee -a " $ARTIFACTS /mysql.txt"
133+ section_end
134+ fi
131135
132136section_start " Setup user"
133137# We're using the admin user in all possible roles
You can’t perform that action at this time.
0 commit comments