diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/agent/alpine/docker-entrypoint.sh +++ b/agent/alpine/docker-entrypoint.sh @@ -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 diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/agent/centos/docker-entrypoint.sh +++ b/agent/centos/docker-entrypoint.sh @@ -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 diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/agent/ubuntu/docker-entrypoint.sh +++ b/agent/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/java-gateway/alpine/docker-entrypoint.sh +++ b/java-gateway/alpine/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/java-gateway/centos/docker-entrypoint.sh +++ b/java-gateway/centos/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/java-gateway/ubuntu/docker-entrypoint.sh +++ b/java-gateway/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index 093f3505c..dbe8aaa1e 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.10 ARG BUILD_DATE ARG VCS_REF @@ -63,16 +63,20 @@ RUN set -eux && \ nginx \ openipmi-libs \ openjdk8-jre-base \ - php5-bcmath \ - php5-ctype \ - php5-fpm \ - php5-gd \ - php5-gettext \ - php5-json \ - php5-ldap \ - php5-mysqli \ - php5-sockets \ - php5-xmlreader \ + php7-bcmath \ + php7-ctype \ + php7-fpm \ + php7-gd \ + php7-gettext \ + php7-json \ + php7-ldap \ + php7-mbstring \ + php7-mysqli \ + php7-session \ + php7-simplexml \ + php7-sockets \ + php7-xmlreader \ + php7-xmlwriter \ supervisor \ pcre \ unixodbc && \ @@ -184,8 +188,8 @@ COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"] COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"] -COPY ["conf/etc/php5/php-fpm.conf", "/etc/php5/"] -COPY ["conf/etc/php5/conf.d/99-zabbix.ini", "/etc/php5/conf.d/"] +COPY ["conf/etc/php7/php-fpm.conf", "/etc/php7/"] +COPY ["conf/etc/php7/conf.d/99-zabbix.ini", "/etc/php7/conf.d/"] COPY ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"] COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/zabbix-appliance/alpine/conf/etc/php5/conf.d/99-zabbix.ini b/zabbix-appliance/alpine/conf/etc/php7/conf.d/99-zabbix.ini similarity index 68% rename from zabbix-appliance/alpine/conf/etc/php5/conf.d/99-zabbix.ini rename to zabbix-appliance/alpine/conf/etc/php7/conf.d/99-zabbix.ini index bf3b66c76..332ad1c5f 100644 --- a/zabbix-appliance/alpine/conf/etc/php5/conf.d/99-zabbix.ini +++ b/zabbix-appliance/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -3,7 +3,7 @@ memory_limit=128M post_max_size=16M upload_max_filesize=2M max_input_time=300 -always_populate_raw_post_data=-1 +; always_populate_raw_post_data=-1 max_input_vars=10000 ; date.timezone=Europe/Riga -; session.save_path=/var/lib/php5 +; session.save_path=/var/lib/php7 diff --git a/zabbix-appliance/alpine/conf/etc/php5/php-fpm.conf b/zabbix-appliance/alpine/conf/etc/php7/php-fpm.conf similarity index 99% rename from zabbix-appliance/alpine/conf/etc/php5/php-fpm.conf rename to zabbix-appliance/alpine/conf/etc/php7/php-fpm.conf index b40fc07da..19e557456 100644 --- a/zabbix-appliance/alpine/conf/etc/php5/php-fpm.conf +++ b/zabbix-appliance/alpine/conf/etc/php7/php-fpm.conf @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) ; - /usr otherwise -include = /etc/php5/fpm.d/*.conf +include = /etc/php7/php-fpm.d/*.conf ;;;;;;;;;;;;;;;;;; ; Global Options ; @@ -161,7 +161,7 @@ group = nginx ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php5-fpm.sock +listen = /var/run/php7-fpm.sock ; Set listen(2) backlog. ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) diff --git a/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf index 44da42390..70b6b577b 100644 --- a/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf +++ b/zabbix-appliance/alpine/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf @@ -15,8 +15,8 @@ redirect_stderr=true stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 -[program:php-fpm5] -command = /usr/bin/%(program_name)s -F -c /etc/php5/%(program_name)s.conf +[program:php-fpm7] +command = /usr/sbin/%(program_name)s -F -c /etc/php7/php-fpm.conf auto_start = true autorestart = true diff --git a/zabbix-appliance/alpine/conf/etc/zabbix/nginx.conf b/zabbix-appliance/alpine/conf/etc/zabbix/nginx.conf index 3bde42701..cd77db528 100644 --- a/zabbix-appliance/alpine/conf/etc/zabbix/nginx.conf +++ b/zabbix-appliance/alpine/conf/etc/zabbix/nginx.conf @@ -51,7 +51,7 @@ server { } location ~ .php$ { - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php7-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/zabbix-appliance/alpine/conf/etc/zabbix/nginx_ssl.conf b/zabbix-appliance/alpine/conf/etc/zabbix/nginx_ssl.conf index b38103186..e3c3e0243 100644 --- a/zabbix-appliance/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/zabbix-appliance/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -75,7 +75,7 @@ server { } location ~ .php$ { - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php7-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/zabbix-appliance/alpine/docker-entrypoint.sh b/zabbix-appliance/alpine/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/zabbix-appliance/alpine/docker-entrypoint.sh +++ b/zabbix-appliance/alpine/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/centos/docker-entrypoint.sh b/zabbix-appliance/centos/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/zabbix-appliance/centos/docker-entrypoint.sh +++ b/zabbix-appliance/centos/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/ubuntu/docker-entrypoint.sh b/zabbix-appliance/ubuntu/docker-entrypoint.sh index 160449885..14b8e2309 100755 --- a/zabbix-appliance/ubuntu/docker-entrypoint.sh +++ b/zabbix-appliance/ubuntu/docker-entrypoint.sh @@ -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