Skip to content

Commit b4d0a38

Browse files
Michael Vasseurvmcj
authored andcommitted
Allow passing the root password
1 parent def9499 commit b4d0a38

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/jobs/baseinstall.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
export version="$1"
66
db=${2:-install}
7+
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
78

89
# If this script is called from unit-tests.sh, we use the test environment
910
export APP_ENV="${3:-prod}"
@@ -76,11 +77,11 @@ section_end
7677

7778
if [ "${db}" = "install" ]; then
7879
section_start "Install DOMjudge database"
79-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot bare-install
80+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} bare-install
8081
section_end
8182
elif [ "${db}" = "upgrade" ]; then
8283
section_start "Upgrade DOMjudge database"
83-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
84+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} upgrade
8485
section_end
8586
fi
8687

@@ -122,7 +123,7 @@ if [ "${db}" = "install" ]; then
122123
# Make sure admin has no team associated so we will not insert submissions during unit tests.
123124
mysql_root "UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
124125
fi
125-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
126+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} install-examples | tee -a "$ARTIFACTS/mysql.txt"
126127
section_end
127128
fi
128129

0 commit comments

Comments
 (0)