diff --git a/agent/alpine/README.md b/agent/alpine/README.md index 60d596211..15a48b244 100644 --- a/agent/alpine/README.md +++ b/agent/alpine/README.md @@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour # Zabbix agent images -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix agent are: +These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are: Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/agent/alpine/docker-entrypoint.sh +++ b/agent/alpine/docker-entrypoint.sh @@ -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 diff --git a/agent/centos/README.md b/agent/centos/README.md index 60d596211..15a48b244 100644 --- a/agent/centos/README.md +++ b/agent/centos/README.md @@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour # Zabbix agent images -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix agent are: +These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are: Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/agent/centos/docker-entrypoint.sh +++ b/agent/centos/docker-entrypoint.sh @@ -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 diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 2472c87ea..67a8ae26f 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty as builder +FROM ubuntu:bionic as builder ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" @@ -9,8 +9,9 @@ ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} -RUN locale-gen $LC_ALL && \ - apt-get ${APT_FLAGS_COMMON} update && \ +RUN apt-get ${APT_FLAGS_COMMON} update && \ + apt-get ${APT_FLAGS_PERSISTENT} install locales && \ + locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_DEV} install \ autoconf \ automake \ @@ -41,7 +42,7 @@ RUN locale-gen $LC_ALL && \ --silent && \ make -j"$(nproc)" -s -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE @@ -77,7 +78,9 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bi COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf -RUN locale-gen $LC_ALL && \ +RUN apt-get ${APT_FLAGS_COMMON} update && \ + apt-get ${APT_FLAGS_PERSISTENT} install locales && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ addgroup --system --quiet zabbix && \ adduser --quiet \ diff --git a/agent/ubuntu/README.md b/agent/ubuntu/README.md index 60d596211..15a48b244 100644 --- a/agent/ubuntu/README.md +++ b/agent/ubuntu/README.md @@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour # Zabbix agent images -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix agent are: +These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are: Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/agent/ubuntu/docker-entrypoint.sh +++ b/agent/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index a739552b5..f67e030f8 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -5,8 +5,8 @@ services: ports: - "10051:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro @@ -66,8 +66,8 @@ services: ports: - "10061:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -117,8 +117,8 @@ services: ports: - "10071:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -174,8 +174,8 @@ services: - mysql-server:mysql-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro deploy: resources: @@ -225,8 +225,8 @@ services: - mysql-server:mysql-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro deploy: resources: @@ -272,8 +272,8 @@ services: ports: - "10050:10050" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 2d338ef03..3d410b303 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -4,13 +4,13 @@ services: build: context: ./server-mysql/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-server-mysql:ubuntu-local ports: - "10051:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro @@ -69,13 +69,13 @@ services: build: context: ./proxy-sqlite3/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-proxy-sqlite3:ubuntu-local ports: - "10061:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -124,13 +124,13 @@ services: build: context: ./proxy-mysql/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-proxy-mysql:ubuntu-local ports: - "10071:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -181,7 +181,7 @@ services: build: context: ./web-apache-mysql/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-web-apache-mysql:ubuntu-local ports: - "80:80" @@ -190,8 +190,8 @@ services: - mysql-server:mysql-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro deploy: resources: @@ -236,7 +236,7 @@ services: build: context: ./web-nginx-mysql/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-web-nginx-mysql:ubuntu-local ports: - "8081:80" @@ -245,8 +245,8 @@ services: - mysql-server:mysql-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro deploy: resources: @@ -291,13 +291,13 @@ services: build: context: ./agent/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-agent:ubuntu-local ports: - "10050:10050" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -335,7 +335,7 @@ services: build: context: ./java-gateway/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-java-gateway:ubuntu-local ports: - "10052:10052" @@ -366,7 +366,7 @@ services: build: context: ./snmptraps/ubuntu cache_from: - - ubuntu:trusty + - ubuntu:bionic image: zabbix-snmptraps:ubuntu-local ports: - "162:162/udp" diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 0b1b463c6..75f5c9106 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -5,8 +5,8 @@ services: ports: - "10051:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro @@ -66,8 +66,8 @@ services: ports: - "10061:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -117,8 +117,8 @@ services: ports: - "10071:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -174,8 +174,8 @@ services: - postgres-server:postgres-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro deploy: resources: @@ -225,8 +225,8 @@ services: - postgres-server:postgres-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro deploy: resources: @@ -272,8 +272,8 @@ services: ports: - "10050:10050" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index f8807e13c..24e822d58 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -6,8 +6,8 @@ services: ports: - "10051:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro @@ -68,8 +68,8 @@ services: ports: - "10061:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -120,8 +120,8 @@ services: ports: - "10071:10051" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro @@ -179,8 +179,8 @@ services: - postgres-server:postgres-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro deploy: resources: @@ -231,8 +231,8 @@ services: - postgres-server:postgres-server - zabbix-server:zabbix-server volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro deploy: resources: @@ -279,8 +279,8 @@ services: ports: - "10050:10050" volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro +# - /etc/localtime:/etc/localtime:ro +# - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro diff --git a/java-gateway/alpine/README.md b/java-gateway/alpine/README.md index d04f7a9f3..f507be718 100644 --- a/java-gateway/alpine/README.md +++ b/java-gateway/alpine/README.md @@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav # Zabbix Java Gateway images -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix Java Gateway are: +These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/java-gateway/alpine/docker-entrypoint.sh +++ b/java-gateway/alpine/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/centos/README.md b/java-gateway/centos/README.md index d04f7a9f3..f507be718 100644 --- a/java-gateway/centos/README.md +++ b/java-gateway/centos/README.md @@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav # Zabbix Java Gateway images -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix Java Gateway are: +These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/java-gateway/centos/docker-entrypoint.sh +++ b/java-gateway/centos/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index 2c82b6af8..6419e8a51 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE @@ -21,7 +21,9 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-ubuntu" \ STOPSIGNAL SIGTERM -RUN locale-gen $LC_ALL && \ +RUN apt-get ${APT_FLAGS_COMMON} update && \ + apt-get ${APT_FLAGS_PERSISTENT} install locales && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ addgroup --system --quiet zabbix && \ adduser --quiet \ @@ -34,7 +36,7 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /etc/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ - openjdk-7-jre-headless && \ + openjdk-8-jre-headless && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -55,7 +57,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ automake \ libc6-dev \ make \ - openjdk-7-jdk \ + openjdk-8-jdk \ pkg-config \ subversion \ gcc && \ @@ -85,7 +87,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ automake \ libc6-dev \ make \ - openjdk-7-jdk \ + openjdk-8-jdk \ pkg-config \ subversion \ gcc && \ diff --git a/java-gateway/ubuntu/README.md b/java-gateway/ubuntu/README.md index d04f7a9f3..f507be718 100644 --- a/java-gateway/ubuntu/README.md +++ b/java-gateway/ubuntu/README.md @@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav # Zabbix Java Gateway images -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix Java Gateway are: +These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/java-gateway/ubuntu/docker-entrypoint.sh +++ b/java-gateway/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index a54e04d35..2d0b754dc 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md index a54e04d35..2d0b754dc 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 96e410096..6447dcc62 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE @@ -23,10 +23,10 @@ LABEL org.label-schema.name="zabbix-${ZBX_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 && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \ addgroup --system --quiet zabbix && \ adduser --quiet \ --system --disabled-login \ @@ -50,14 +50,14 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ - libcurl3 \ - libevent-2.0 \ - libmysqlclient18 \ + libcurl4 \ + libevent-2.1 \ + libmysqlclient20 \ libopenipmi0 \ libpcre3 \ libsnmp30 \ libssh2-1 \ - libssl1.0.0 \ + libssl1.1 \ libxml2 \ mysql-client \ snmp-mibs-downloader \ diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index a54e04d35..2d0b754dc 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index a8dd8ead8..0962e4ffc 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md index a8dd8ead8..0962e4ffc 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 03fc25285..ec691ec66 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE @@ -22,10 +22,10 @@ LABEL org.label-schema.name="zabbix-${ZBX_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 && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \ addgroup --system --quiet zabbix && \ adduser --quiet \ --system --disabled-login \ @@ -48,14 +48,14 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ - libcurl3 \ - libevent-2.0 \ + libcurl4 \ + libevent-2.1 \ libopenipmi0 \ libpcre3 \ libsnmp30 \ libsqlite3-0 \ libssh2-1 \ - libssl1.0.0 \ + libssl1.1 \ libxml2 \ snmp-mibs-downloader \ unixodbc && \ diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index a8dd8ead8..0962e4ffc 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are: Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index ddf26634b..0f0038e27 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index ddf26634b..0f0038e27 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 07728c624..284e61121 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE @@ -22,10 +22,10 @@ LABEL org.label-schema.name="zabbix-${ZBX_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 && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \ addgroup --system --quiet zabbix && \ adduser --quiet \ --system --disabled-login \ @@ -51,15 +51,15 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ - libcurl3 \ - libevent-2.0 \ + libcurl4 \ + libevent-2.1 \ libiksemel3 \ - libmysqlclient18 \ + libmysqlclient20 \ libopenipmi0 \ libpcre3 \ libsnmp30 \ libssh2-1 \ - libssl1.0.0 \ + libssl1.1 \ libxml2 \ mysql-client \ snmp-mibs-downloader \ diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index ddf26634b..0f0038e27 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index de99b700f..f9fbe8077 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index de99b700f..f9fbe8077 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 3096eacd8..bfcc70b7a 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE @@ -22,10 +22,10 @@ LABEL org.label-schema.name="zabbix-${ZBX_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 && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \ addgroup --system --quiet zabbix && \ adduser --quiet \ --system --disabled-login \ @@ -51,15 +51,15 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ - libcurl3 \ - libevent-2.0 \ + libcurl4 \ + libevent-2.1 \ libiksemel3 \ libopenipmi0 \ libpcre3 \ libpq5 \ libsnmp30 \ libssh2-1 \ - libssl1.0.0 \ + libssl1.1 \ libxml2 \ postgresql-client \ snmp-mibs-downloader \ diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index de99b700f..f9fbe8077 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are: Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/snmptraps/alpine/README.md b/snmptraps/alpine/README.md index 51fa5bee2..59654efc4 100644 --- a/snmptraps/alpine/README.md +++ b/snmptraps/alpine/README.md @@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac # Zabbix snmptraps images -These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix snmptraps are: +These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are: Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/snmptraps/centos/README.md b/snmptraps/centos/README.md index 51fa5bee2..59654efc4 100644 --- a/snmptraps/centos/README.md +++ b/snmptraps/centos/README.md @@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac # Zabbix snmptraps images -These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix snmptraps are: +These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are: Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index 539191610..957e63e64 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE @@ -33,10 +33,10 @@ STOPSIGNAL SIGTERM COPY ["snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb", "/tmp/"] -RUN locale-gen $LC_ALL && \ +RUN apt-get ${APT_FLAGS_COMMON} update && \ + apt-get ${APT_FLAGS_PERSISTENT} install locales && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb http://us.archive.ubuntu.com/ubuntu/ $DISTRIB_CODENAME multiverse" >> /etc/apt/sources.list && \ addgroup --system --quiet zabbix && \ adduser --quiet \ --system --disabled-login \ diff --git a/snmptraps/ubuntu/README.md b/snmptraps/ubuntu/README.md index 51fa5bee2..59654efc4 100644 --- a/snmptraps/ubuntu/README.md +++ b/snmptraps/ubuntu/README.md @@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac # Zabbix snmptraps images -These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix snmptraps are: +These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are: Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index 976dea8eb..23bee9b96 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/README.md @@ -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.*) diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index 976dea8eb..23bee9b96 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/README.md @@ -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.*) diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 5f6bb6da3..efd37e80f 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE @@ -21,7 +21,9 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${DB_TYPE}-ubuntu" \ STOPSIGNAL SIGTERM -RUN locale-gen $LC_ALL && \ +RUN apt-get ${APT_FLAGS_COMMON} update && \ + apt-get ${APT_FLAGS_PERSISTENT} install locales && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ addgroup --system --quiet zabbix && \ adduser --quiet \ @@ -37,12 +39,15 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTENT} install \ apache2 \ curl \ - libapache2-mod-php5 \ + libapache2-mod-php \ mysql-client \ - php5-gd \ - php5-json \ - php5-ldap \ - php5-mysql \ + php7.2-bcmath \ + php7.2-gd \ + php7.2-json \ + php7.2-ldap \ + php7.2-mbstring \ + php7.2-mysql \ + php7.2-xml \ ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ @@ -102,7 +107,7 @@ VOLUME ["/etc/ssl/apache2"] COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"] -COPY ["conf/etc/php5/apache2/conf.d/99-zabbix.ini", "/etc/php5/apache2/conf.d/"] +COPY ["conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini", "/etc/php/7.2/apache2/conf.d/"] COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index 976dea8eb..23bee9b96 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/README.md @@ -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.*) diff --git a/web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini b/web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini similarity index 80% rename from web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini rename to web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini index 2ceb8be41..a7a7c4c8b 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini +++ b/web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/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/php/sessions diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index 63d0e357a..e9578b5e2 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/README.md @@ -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.*) diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index 63d0e357a..e9578b5e2 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/README.md @@ -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.*) diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 8e3fe16f7..6eefe8708 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " 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 && \ + locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ addgroup --system --quiet zabbix && \ adduser --quiet \ @@ -37,11 +39,14 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_PERSISTENT} install \ apache2 \ curl \ - libapache2-mod-php5 \ - php5-gd \ - php5-json \ - php5-ldap \ - php5-pgsql \ + libapache2-mod-php \ + php7.2-bcmath \ + php7.2-gd \ + php7.2-json \ + php7.2-ldap \ + php7.2-mbstring \ + php7.2-xml \ + php7.2-pgsql \ postgresql-client \ ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ @@ -102,7 +107,7 @@ VOLUME ["/etc/ssl/apache2"] COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"] -COPY ["conf/etc/php5/apache2/conf.d/99-zabbix.ini", "/etc/php5/apache2/conf.d/"] +COPY ["conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini", "/etc/php/7.2/apache2/conf.d/"] COPY ["docker-entrypoint.sh", "/usr/bin/"] ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index 63d0e357a..e9578b5e2 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/README.md @@ -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.*) diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini b/web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini similarity index 80% rename from web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini rename to web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini index 2ceb8be41..a7a7c4c8b 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/php5/fpm/conf.d/99-zabbix.ini +++ b/web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/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/php/sessions diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index 76d08ae61..a035e68c6 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/README.md @@ -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.*) diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index 76d08ae61..a035e68c6 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/README.md @@ -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.*) diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 918dca62e..deb4cdade 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " 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 \ @@ -44,19 +46,22 @@ RUN locale-gen $LC_ALL && \ curl \ mysql-client \ nginx \ - php5-fpm \ - php5-gd \ - php5-json \ - php5-ldap \ - php5-mysql \ + php7.2-bcmath \ + php7.2-fpm \ + php7.2-gd \ + php7.2-json \ + php7.2-ldap \ + php7.2-mbstring \ + php7.2-mysql \ + php7.2-xml \ supervisor \ ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} purge \ 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/* @@ -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"] diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index 76d08ae61..a035e68c6 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/README.md @@ -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.*) diff --git a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf index b263fb42a..fe6ad67e0 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf +++ b/web-nginx-mysql/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/web-apache-mysql/ubuntu/conf/etc/php5/apache2/conf.d/99-zabbix.ini b/web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini similarity index 83% rename from web-apache-mysql/ubuntu/conf/etc/php5/apache2/conf.d/99-zabbix.ini rename to web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini index 2ceb8be41..05b3da8f1 100644 --- a/web-apache-mysql/ubuntu/conf/etc/php5/apache2/conf.d/99-zabbix.ini +++ b/web-nginx-mysql/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/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index f1d5f297a..4055ea6d7 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.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/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf index 3bde42701..e1331f0bf 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/web-nginx-mysql/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/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index b38103186..2d68009ab 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-mysql/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; diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index 0bb924b66..82974d997 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/README.md @@ -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.*) diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index 0bb924b66..82974d997 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/README.md @@ -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.*) diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 8a7a3adb9..56bbae22b 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " 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"] diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index 0bb924b66..82974d997 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/README.md @@ -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.*) diff --git a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf index b263fb42a..fe6ad67e0 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf +++ b/web-nginx-pgsql/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/web-apache-pgsql/ubuntu/conf/etc/php5/apache2/conf.d/99-zabbix.ini b/web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini similarity index 83% rename from web-apache-pgsql/ubuntu/conf/etc/php5/apache2/conf.d/99-zabbix.ini rename to web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/conf.d/99-zabbix.ini index 2ceb8be41..05b3da8f1 100644 --- a/web-apache-pgsql/ubuntu/conf/etc/php5/apache2/conf.d/99-zabbix.ini +++ b/web-nginx-pgsql/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/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index f1d5f297a..4055ea6d7 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.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/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf index 3bde42701..e1331f0bf 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/web-nginx-pgsql/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/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index b38103186..2d68009ab 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-pgsql/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; diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/alpine/README.md b/zabbix-appliance/alpine/README.md index 47e46daee..d58373441 100644 --- a/zabbix-appliance/alpine/README.md +++ b/zabbix-appliance/alpine/README.md @@ -14,7 +14,7 @@ Zabbix appliance contains MySQL database server, Zabbix server, Zabbix Java Gate # Zabbix appliance images -These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix appliance are: +These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix appliance are: Zabbix appliance 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix appliance 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/zabbix-appliance/alpine/docker-entrypoint.sh b/zabbix-appliance/alpine/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/zabbix-appliance/alpine/docker-entrypoint.sh +++ b/zabbix-appliance/alpine/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/centos/README.md b/zabbix-appliance/centos/README.md index 47e46daee..d58373441 100644 --- a/zabbix-appliance/centos/README.md +++ b/zabbix-appliance/centos/README.md @@ -14,7 +14,7 @@ Zabbix appliance contains MySQL database server, Zabbix server, Zabbix Java Gate # Zabbix appliance images -These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix appliance are: +These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix appliance are: Zabbix appliance 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix appliance 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/zabbix-appliance/centos/docker-entrypoint.sh b/zabbix-appliance/centos/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/zabbix-appliance/centos/docker-entrypoint.sh +++ b/zabbix-appliance/centos/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/rhel/README.md b/zabbix-appliance/rhel/README.md index 8399de4fd..5cf48dc6e 100644 --- a/zabbix-appliance/rhel/README.md +++ b/zabbix-appliance/rhel/README.md @@ -14,7 +14,7 @@ Zabbix appliance contains MySQL database server, Zabbix server, Zabbix Java Gate # Zabbix appliance images -These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty), CentOS 7 and Red Hat Enterprise Linux 7 images. The available versions of Zabbix appliance are: +These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic), CentOS 7 and Red Hat Enterprise Linux 7 images. The available versions of Zabbix appliance are: Zabbix appliance 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix appliance 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index b77cc0b57..a28fc38d4 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -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() { @@ -661,11 +662,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}" - if [ $type == "proxy" ]; then - update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}" - update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" - fi - if [ "$db_type" == "sqlite3" ]; then update_config_var $ZBX_CONFIG "DBHost" update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db" @@ -681,11 +677,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi - if [ $type == "server" ]; then - update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}" - update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}" - fi - update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}" if [ "$type" == "proxy" ]; then @@ -705,10 +696,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" if [ "$type" == "server" ]; then - update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}" update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}" update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}" - update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}" fi ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"} @@ -845,6 +834,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 diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index a14275def..d1f283ebf 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty as builder +FROM ubuntu:bionic as builder ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" @@ -81,7 +81,7 @@ RUN locale-gen $LC_ALL && \ rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh -FROM ubuntu:trusty +FROM ubuntu:bionic LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE diff --git a/zabbix-appliance/ubuntu/README.md b/zabbix-appliance/ubuntu/README.md index 47e46daee..d58373441 100644 --- a/zabbix-appliance/ubuntu/README.md +++ b/zabbix-appliance/ubuntu/README.md @@ -14,7 +14,7 @@ Zabbix appliance contains MySQL database server, Zabbix server, Zabbix Java Gate # Zabbix appliance images -These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 14.04 (trusty) and CentOS 7 images. The available versions of Zabbix appliance are: +These are the only official Zabbix appliance Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix appliance are: Zabbix appliance 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest) Zabbix appliance 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) diff --git a/zabbix-appliance/ubuntu/docker-entrypoint.sh b/zabbix-appliance/ubuntu/docker-entrypoint.sh index b77cc0b57..bd3a9ab50 100755 --- a/zabbix-appliance/ubuntu/docker-entrypoint.sh +++ b/zabbix-appliance/ubuntu/docker-entrypoint.sh @@ -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