Nardo86
/
zm-docker
mirror of https://github.com/Nardo86/zm-docker.git
1
0
Fork 0
Code Issues Activity

Added wait to mysql to come up (and infinite loop if there is a problem so it won't make damage)

This commit is contained in:
Eros Nardi 2021-03-02 10:52:23 +01:00
parent 5306f931d6
commit 8179f73542
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
entrypoint.sh
View File

@ -13,7 +13,11 @@ sed -i -e 's,/var/lib/mysql,/config/mysql,g' /etc/mysql/mariadb.conf.d/50-server
echo "Check MariaDB config" echo "Check MariaDB config"
/etc/init.d/mysql start /etc/init.d/mysql start
sleep 5 while ! mysqladmin ping --silent; do
echo "Waiting mysql startup..."
sleep 3
done
RESULT=$(mysqlshow --user=zmuser --password=zmpass zm| grep -v Wildcard | grep -o Tables) RESULT=$(mysqlshow --user=zmuser --password=zmpass zm| grep -v Wildcard | grep -o Tables)
if [ "$RESULT" != "Tables" ]; then if [ "$RESULT" != "Tables" ]; then
@ -39,6 +43,10 @@ y
EOF EOF
/etc/init.d/mysql restart /etc/init.d/mysql restart
while ! mysqladmin ping --silent; do
echo "Waiting mysql restart"
sleep 3
done
echo "Configuration done" echo "Configuration done"
else else
echo "MariaDB already configured" echo "MariaDB already configured"
@ -50,6 +58,10 @@ if [ "$RESULT" = "" ]; then
echo "Set Mysql timezone" echo "Set Mysql timezone"
printf "[mysqld]\n default-time-zone=$(cat /etc/timezone)" >> /etc/mysql/my.cnf printf "[mysqld]\n default-time-zone=$(cat /etc/timezone)" >> /etc/mysql/my.cnf
/etc/init.d/mysql restart /etc/init.d/mysql restart
while ! mysqladmin ping --silent; do
echo "Waiting mysql restart..."
sleep 3
done
fi fi
RESULT=$(cat /etc/php/*/apache2/php.ini| grep "date.timezone =") RESULT=$(cat /etc/php/*/apache2/php.ini| grep "date.timezone =")