Skip to content

Commit 507fe95

Browse files
committed
Allow passing the root password
1 parent 30160e7 commit 507fe95

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

@@ -83,11 +85,11 @@ section_end
8385

8486
if [ "${db}" = "install" ]; then
8587
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
8789
section_end
8890
elif [ "${db}" = "upgrade" ]; then
8991
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
9193
section_end
9294
fi
9395

@@ -129,7 +131,7 @@ if [ "${db}" = "install" ]; then
129131
# Make sure admin has no team associated so we will not insert submissions during unit tests.
130132
mysql_root "UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
131133
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"
133135
section_end
134136
fi
135137

0 commit comments

Comments
 (0)