extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 00:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Ubuntu to 18.04 (bionic) release

Browse Source
This commit is contained in:
root
2018-07-20 11:23:08 +09:00
parent 0bd48d17bb 90b9592c94
commit a37653be47
99 changed files with 382 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:trusty
FROM ubuntu:bionic
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@ -21,7 +21,9 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
STOPSIGNAL SIGTERM
RUN locale-gen $LC_ALL && \
RUN apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install locales gnupg2 && \
locale-gen $LC_ALL && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
addgroup --system --quiet zabbix && \
adduser --quiet \
@ -43,11 +45,14 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTENT} install \
curl \
nginx \
php5-fpm \
php5-gd \
php5-json \
php5-ldap \
php5-pgsql \
php7.2-bcmath \
php7.2-fpm \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-xml \
php7.2-pgsql \
postgresql-client \
supervisor \
ttf-dejavu-core && \
@ -116,7 +121,7 @@ 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/fpm/conf.d/99-zabbix.ini", "/etc/php5/fpm/conf.d/"]
COPY ["conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini", "/etc/php/7.2/fpm/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]

2
web-nginx-pgsql/ubuntu/README.md
View File

@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
# Zabbix web interface images
These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix web interface are:
These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

2
web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf
View File

@ -1,6 +1,6 @@
user www-data;
worker_processes 5;
worker_rlimit_nofile 256000;
#worker_rlimit_nofile 256000;
error_log /dev/fd/2 warn;

2
web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini → web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini
View File

@ -5,4 +5,4 @@ upload_max_filesize=2M
max_input_time=300
always_populate_raw_post_date=-1
; date.timezone=Europe/Riga
session.save_path=/var/lib/php5
session.save_path=/var/lib/php7

4
web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php5-fpm]
command = /usr/sbin/%(program_name)s -F -c /etc/php5/fpm/php-fpm.conf
[program:php-fpm7.2]
command = /usr/sbin/%(program_name)s -F -c /etc/php/7.2/fpm/php-fpm.conf
auto_start = true
autorestart = true

2
web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf
View File

@ -51,7 +51,7 @@ server {
}
location ~ .php$ {
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name;

2
web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
View File

@ -75,7 +75,7 @@ server {
}
location ~ .php$ {
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name;

5
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -593,6 +593,7 @@ prepare_web_server_nginx() {
fi
ln -sf /dev/fd/2 /var/log/php5-fpm.log
ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
}
stop_databases() {
@ -845,6 +846,10 @@ prepare_zbx_web_config() {
PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
fi
if [ -n "$PHP_CONFIG_FILE" ]; then