extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-03 21:23:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.0

Browse Source
This commit is contained in:
root 2018-07-20 12:54:05 +09:00
commit d41d4b4eb2
6 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zabbix-appliance/ubuntu/Dockerfile
View File

@ -14,7 +14,9 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
COPY ["conf/tmp/font-config", "/tmp/font-config"] COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN locale-gen $LC_ALL && \ RUN apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_DEV} install locales && \
locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_DEV} install \ apt-get ${APT_FLAGS_DEV} install \
autoconf \ autoconf \
@ -31,7 +33,7 @@ RUN locale-gen $LC_ALL && \
libssh2-1-dev \ libssh2-1-dev \
libxml2-dev \ libxml2-dev \
make \ make \
openjdk-7-jdk \ openjdk-8-jdk \
patch \ patch \
pkg-config \ pkg-config \
subversion \ subversion \
@ -122,7 +124,9 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/ /usr/sbin/za
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/frontends/php/ /usr/share/zabbix/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/frontends/php/ /usr/share/zabbix/
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 && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
addgroup --system --quiet zabbix && \ addgroup --system --quiet zabbix && \
adduser --quiet \ adduser --quiet \
@ -155,23 +159,26 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
fping \ fping \
libcurl3 \ libcurl4 \
libiksemel3 \ libiksemel3 \
libmysqlclient18 \ libmysqlclient20 \
libopenipmi0 \ libopenipmi0 \
libsnmp30 \ libsnmp30 \
libssh2-1 \ libssh2-1 \
libssl1.0.0 \ libssl1.1 \
libxml2 \ libxml2 \
mysql-client \ mysql-client \
mysql-server \ mysql-server \
nginx \ nginx \
openjdk-7-jre-headless \ openjdk-8-jre-headless \
php5-fpm \ php7.2-bcmath \
php5-gd \ php7.2-fpm \
php5-json \ php7.2-gd \
php5-ldap \ php7.2-json \
php5-mysql \ php7.2-ldap \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml \
snmp-mibs-downloader \ snmp-mibs-downloader \
supervisor \ supervisor \
ttf-dejavu-core \ ttf-dejavu-core \
@ -188,8 +195,8 @@ RUN locale-gen $LC_ALL && \
wget && \ wget && \
apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
mkdir -p /var/lib/php5 && \ mkdir -p /var/lib/php7 && \
chown --quiet -R www-data:www-data /var/lib/php5 && \ chown --quiet -R www-data:www-data /var/lib/php7 && \
rm -rf /var/cache/nginx/* && \ rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -206,7 +213,7 @@ COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/nginx_ssl.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/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"] 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 ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"] COPY ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"]
COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"] COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]

2
zabbix-appliance/ubuntu/conf/etc/nginx/nginx.conf
View File

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

2
zabbix-appliance/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini → zabbix-appliance/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 max_input_time=300
always_populate_raw_post_date=-1 always_populate_raw_post_date=-1
; date.timezone=Europe/Riga ; date.timezone=Europe/Riga
session.save_path=/var/lib/php5 session.save_path=/var/lib/php7

4
zabbix-appliance/ubuntu/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
View File

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

2
zabbix-appliance/ubuntu/conf/etc/zabbix/nginx.conf
View File

@ -51,7 +51,7 @@ server {
} }
location ~ .php$ { 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_index index.php;
fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name;

2
zabbix-appliance/ubuntu/conf/etc/zabbix/nginx_ssl.conf
View File

@ -75,7 +75,7 @@ server {
} }
location ~ .php$ { 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_index index.php;
fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name;