Skip to content

Commit b9f02de

Browse files
committed
Allow passing the root password
1 parent 956db50 commit b9f02de

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

.github/jobs/baseinstall.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ export version="$1"
66
db=${2:-install}
77
phpversion="${3}"
88

9+
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
10+
911
# If this script is called from unit-tests.sh, we use the test environment
1012
export APP_ENV="${3:-prod}"
1113

@@ -86,11 +88,11 @@ section_end
8688

8789
if [ "${db}" = "install" ]; then
8890
section_start "Install DOMjudge database"
89-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot bare-install
91+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} bare-install
9092
section_end
9193
elif [ "${db}" = "upgrade" ]; then
9294
section_start "Upgrade DOMjudge database"
93-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
95+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} upgrade
9496
section_end
9597
fi
9698

@@ -132,7 +134,7 @@ if [ "${db}" = "install" ]; then
132134
# Make sure admin has no team associated so we will not insert submissions during unit tests.
133135
mysql_root "UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
134136
fi
135-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
137+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} install-examples | tee -a "$ARTIFACTS/mysql.txt"
136138
section_end
137139
fi
138140

0 commit comments

Comments
 (0)