nomad
/
mariadb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix user init

This commit is contained in:
Daniel Berteaud 2024-01-10 16:23:11 +01:00
parent 2cd70a52bb
commit cc7d2f7eec
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/images/mariadb/root/entrypoint.d/20-mariadb-init.sh
View File

@ -23,10 +23,10 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' identified by '$MYSQL_ROOT_PAS
DROP DATABASE test;
EOF
if [ "$MYSQL_DATABASE" != "" ]; then
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` CHARACTER SET utf8 COLLATE utf8_general_ci;" >> $tfile
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` CHARACTER SET utf8 COLLATE utf8_general_ci;"
if [ "$MYSQL_USER" != "" ]; then
echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';" >> $tfile
echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';"
fi
fi

4
example/mariadb.nomad.hcl
View File

@ -58,7 +58,7 @@ job "mariadb" {
}
config {
image = "danielberteaud/mariadb:24.1-1"
image = "danielberteaud/mariadb:24.1-2"
pids_limit = 100
command = "/local/mysql_upgrade.sh"
}
@ -127,7 +127,7 @@ _EOT
kill_timeout = "5m"
config {
image = "danielberteaud/mariadb:24.1-1"
image = "danielberteaud/mariadb:24.1-2"
volumes = [
"secrets/:/etc/my.cnf.d",
"secrets/my.conf:/var/lib/mysql/.my.cnf:ro",

4
images/mariadb/root/entrypoint.d/20-mariadb-init.sh
View File

@ -23,10 +23,10 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' identified by '$MYSQL_ROOT_PAS
DROP DATABASE test;
EOF
if [ "$MYSQL_DATABASE" != "" ]; then
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` CHARACTER SET utf8 COLLATE utf8_general_ci;" >> $tfile
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` CHARACTER SET utf8 COLLATE utf8_general_ci;"
if [ "$MYSQL_USER" != "" ]; then
echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';" >> $tfile
echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';"
fi
fi

2
variables.yml
View File

@ -9,7 +9,7 @@ mariadb:
server:
# The image to use
image: '[[ .docker.repo ]]mariadb:24.1-1'
image: '[[ .docker.repo ]]mariadb:24.1-2'
# Resource allocation
resources: