extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-30 14:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
Alexey Pustovalov
2019-07-13 18:03:05 +03:00
parent 7c9a3e4b81 be195c5861
commit 26c3a5c79b
40 changed files with 127 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -54,6 +54,9 @@ configure_db_mysql() {
elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
elif [ -f "/etc/my.cnf.d/mariadb-server.cnf" ]; then
MYSQL_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf"
DB_SERVER_SOCKET="/var/run/mysqld/mysqld.sock"
else
echo "**** Could not found MySQL configuration file"
exit 1