mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-23 23:09:20 +01:00
Zabbix Appliance: Updated Alpine to 3.10
This commit is contained in:
Alexey Pustovalov
parent
0a3b83743c
commit
3a17397ee2
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.8
|
||||
FROM alpine:3.10
|
||||
|
||||
ARG BUILD_DATE
|
||||
ARG VCS_REF
|
||||
@ -62,16 +62,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 \
|
||||
unixodbc && \
|
||||
rm -rf /var/cache/apk/*
|
||||
@ -180,8 +184,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/"]
|
||||
|
||||
@ -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
|
||||
@ -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)
|
||||
@ -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
|
||||
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
@ -51,6 +51,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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user