From 666242082d3ea965b6c876b03c5ac17e7e5e8974 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Jul 2018 12:52:59 +0900 Subject: [PATCH] Updated Ubuntu to 18.04 (bionic) release --- zabbix-appliance/ubuntu/Dockerfile | 37 +++++++++++-------- .../ubuntu/conf/etc/nginx/nginx.conf | 2 +- .../7.2}/fpm/conf.d/99-zabbix.ini | 2 +- .../conf.d/supervisord_web_nginx.conf | 4 +- .../ubuntu/conf/etc/zabbix/nginx.conf | 2 +- .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 2 +- 6 files changed, 28 insertions(+), 21 deletions(-) rename zabbix-appliance/ubuntu/conf/etc/{php5 => php/7.2}/fpm/conf.d/99-zabbix.ini (83%) diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index 4f82e09ea..099c073f5 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -14,7 +14,9 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ 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_DEV} install \ autoconf \ @@ -31,7 +33,7 @@ RUN locale-gen $LC_ALL && \ libssh2-1-dev \ libxml2-dev \ make \ - openjdk-7-jdk \ + openjdk-8-jdk \ patch \ pkg-config \ 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/ -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 \ @@ -155,23 +159,26 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ - libcurl3 \ + libcurl4 \ libiksemel3 \ - libmysqlclient18 \ + libmysqlclient20 \ libopenipmi0 \ libsnmp30 \ libssh2-1 \ - libssl1.0.0 \ + libssl1.1 \ libxml2 \ mysql-client \ mysql-server \ nginx \ - openjdk-7-jre-headless \ - php5-fpm \ - php5-gd \ - php5-json \ - php5-ldap \ - php5-mysql \ + openjdk-8-jre-headless \ + php7.2-bcmath \ + php7.2-fpm \ + php7.2-gd \ + php7.2-json \ + php7.2-ldap \ + php7.2-mbstring \ + php7.2-mysql \ + php7.2-xml \ snmp-mibs-downloader \ supervisor \ ttf-dejavu-core \ @@ -188,8 +195,8 @@ RUN locale-gen $LC_ALL && \ wget && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ - mkdir -p /var/lib/php5 && \ - chown --quiet -R www-data:www-data /var/lib/php5 && \ + mkdir -p /var/lib/php7 && \ + chown --quiet -R www-data:www-data /var/lib/php7 && \ rm -rf /var/cache/nginx/* && \ 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/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 ["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/ubuntu/conf/etc/nginx/nginx.conf b/zabbix-appliance/ubuntu/conf/etc/nginx/nginx.conf index b263fb42a..fe6ad67e0 100644 --- a/zabbix-appliance/ubuntu/conf/etc/nginx/nginx.conf +++ b/zabbix-appliance/ubuntu/conf/etc/nginx/nginx.conf @@ -1,6 +1,6 @@ user www-data; worker_processes 5; -worker_rlimit_nofile 256000; +#worker_rlimit_nofile 256000; error_log /dev/fd/2 warn; diff --git a/zabbix-appliance/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini b/zabbix-appliance/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini similarity index 83% rename from zabbix-appliance/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini rename to zabbix-appliance/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini index 2ceb8be41..05b3da8f1 100644 --- a/zabbix-appliance/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini +++ b/zabbix-appliance/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini @@ -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 diff --git a/zabbix-appliance/ubuntu/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/zabbix-appliance/ubuntu/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf index f1d5f297a..4055ea6d7 100644 --- a/zabbix-appliance/ubuntu/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf +++ b/zabbix-appliance/ubuntu/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: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 diff --git a/zabbix-appliance/ubuntu/conf/etc/zabbix/nginx.conf b/zabbix-appliance/ubuntu/conf/etc/zabbix/nginx.conf index 3bde42701..e1331f0bf 100644 --- a/zabbix-appliance/ubuntu/conf/etc/zabbix/nginx.conf +++ b/zabbix-appliance/ubuntu/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/php/php7.2-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/zabbix-appliance/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/zabbix-appliance/ubuntu/conf/etc/zabbix/nginx_ssl.conf index b38103186..2d68009ab 100644 --- a/zabbix-appliance/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/zabbix-appliance/ubuntu/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/php/php7.2-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name;