Skip to content

Commit 7649689

Browse files
committed
Allow passing the root password
1 parent 34c2c4d commit 7649689

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
@@ -5,6 +5,8 @@
55
export version="$1"
66
db=${2:-install}
77

8+
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
9+
810
set -eux
911

1012
PHPVERSION=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')
@@ -72,11 +74,11 @@ section_end
7274

7375
if [ "${db}" = "install" ]; then
7476
section_start "Install DOMjudge database"
75-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot bare-install
77+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} bare-install
7678
section_end
7779
elif [ "${db}" = "upgrade" ]; then
7880
section_start "Upgrade DOMjudge database"
79-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
81+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} upgrade
8082
section_end
8183
fi
8284

@@ -114,7 +116,7 @@ section_end
114116

115117
if [ "${db}" = "install" ]; then
116118
section_start "Install the example data"
117-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
119+
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} install-examples | tee -a "$ARTIFACTS/mysql.txt"
118120
section_end
119121
fi
120122

0 commit comments

Comments
 (0)