diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 5c0a3c704..e105d0c98 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -37,7 +37,8 @@ RUN set -eux && \ tini \ tzdata \ ca-certificates \ - libssl1.1 \ + libssl3 \ + libxml2 \ libcurl4 \ libmodbus5 \ libpcre2-8-0 \ diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index b2cb1367e..cb2cd8cd9 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -39,7 +39,8 @@ RUN set -eux && \ ca-certificates \ smartmontools \ sudo \ - libssl1.1 \ + libssl3 \ + libxml2 \ libcurl4 \ libpcre2-8-0 \ libldap-2.4" && \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 1ae61686d..a5abb76b0 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION=6.2 ARG ZBX_VERSION=${MAJOR_VERSION} ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} \ - PATH=/usr/local/go/bin:$PATH + ZBX_VERSION=${ZBX_VERSION} \ + PATH=/usr/lib/go-1.18/bin:$PATH LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ @@ -41,47 +41,12 @@ RUN set -eux && \ pkg-config \ gettext \ git \ - gnupg \ - curl \ + golang-1.18 \ unixodbc-dev" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ ${INSTALL_PKGS} && \ - ARCH_SUFFIX="$(arch)"; \ - case "$ARCH_SUFFIX" in \ - x86_64) \ - url='https://dl.google.com/go/go1.17.8.linux-amd64.tar.gz'; \ - sha256='980e65a863377e69fd9b67df9d8395fd8e93858e7a24c9f55803421e453f4f99'; \ - ;; \ - aarch64) \ - url='https://dl.google.com/go/go1.17.8.linux-arm64.tar.gz'; \ - sha256='57a9171682e297df1a5bd287be056ed0280195ad079af90af16dcad4f64710cb'; \ - ;; \ - armv7l) \ - url='https://dl.google.com/go/go1.17.8.linux-armv6l.tar.gz'; \ - sha256='3287ca2fe6819fa87af95182d5942bf4fa565aff8f145812c6c70c0466ce25ae'; \ - ;; \ - s390x) \ - url='https://dl.google.com/go/go1.17.8.linux-s390x.tar.gz'; \ - sha256='3fac23801644a2f93a1643acecd5a94a5ea05d88e19467092fb6e64205710f61'; \ - ;; \ - ppc64le) \ - url='https://dl.google.com/go/go1.17.8.linux-ppc64le.tar.gz'; \ - sha256='2077dd2fc57a74b0630b0c239ae4e3114607311778effd43fcfe5174133ee188'; \ - ;; \ - *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ - esac; \ - curl "$url.asc" --output go.tgz.asc && \ - curl "$url" --output go.tgz && \ - echo "$sha256 *go.tgz" | sha256sum -c - && \ - GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \ - gpg --batch --verify go.tgz.asc go.tgz && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" go.tgz.asc && \ - tar -C /usr/local -xzf go.tgz && \ - rm go.tgz && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 4c0d89130..1e3824301 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index f289f573d..e8eb9735c 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -6,7 +6,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -44,9 +44,9 @@ RUN set -eux && \ libmysqlclient21 \ libopenipmi0 \ libpcre2-8-0 \ - libsnmp35 \ + libsnmp40 \ libssh-4 \ - libssl1.1 \ + libssl3 \ libxml2 \ mysql-client \ snmp-mibs-downloader \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index c031cecaa..d3ea42242 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -42,10 +42,10 @@ RUN set -eux && \ libevent-2.1 \ libopenipmi0 \ libpcre2-8-0 \ - libsnmp35 \ + libsnmp40 \ libsqlite3-0 \ libssh-4 \ - libssl1.1 \ + libssl3 \ libxml2 \ snmp-mibs-downloader \ unixodbc" && \ diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 7ce0c7ca8..ebf7efb79 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -47,9 +47,9 @@ RUN set -eux && \ libmysqlclient21 \ libopenipmi0 \ libpcre2-8-0 \ - libsnmp35 \ + libsnmp40 \ libssh-4 \ - libssl1.1 \ + libssl3 \ libxml2 \ mysql-client \ snmp-mibs-downloader \ diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 42ba1a8c2..016ffd4ad 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -48,9 +48,9 @@ RUN set -eux && \ libopenipmi0 \ libpcre2-8-0 \ libpq5 \ - libsnmp35 \ + libsnmp40 \ libssh-4 \ - libssl1.1 \ + libssl3 \ libxml2 \ postgresql-client \ snmp-mibs-downloader \ diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 2ff27a306..5d7df7ae6 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION=6.2 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index d45275b34..7a1bbdbe1 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -38,13 +38,12 @@ RUN set -eux && \ ca-certificates \ mysql-client \ locales \ - php7.4-bcmath \ - php7.4-gd \ - php7.4-json \ - php7.4-ldap \ - php7.4-mbstring \ - php7.4-mysql \ - php7.4-xml" && \ + php8.1-bcmath \ + php8.1-gd \ + php8.1-ldap \ + php8.1-mbstring \ + php8.1-mysql \ + php8.1-xml" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ @@ -97,9 +96,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.4/ && \ - chgrp -R 0 /etc/apache2/ /etc/php/7.4/ && \ - chmod -R g=u /etc/apache2/ /etc/php/7.4/ && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.1/ && \ + chgrp -R 0 /etc/apache2/ /etc/php/8.1/ && \ + chmod -R g=u /etc/apache2/ /etc/php/8.1/ && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index 0bfa2f283..e2f5e1e5c 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -37,13 +37,12 @@ RUN set -eux && \ libapache2-mod-php \ ca-certificates \ locales \ - php7.4-bcmath \ - php7.4-gd \ - php7.4-json \ - php7.4-ldap \ - php7.4-mbstring \ - php7.4-xml \ - php7.4-pgsql \ + php8.1-bcmath \ + php8.1-gd \ + php8.1-ldap \ + php8.1-mbstring \ + php8.1-xml \ + php8.1-pgsql \ postgresql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ @@ -97,9 +96,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.4/ && \ - chgrp -R 0 /etc/apache2/ /etc/php/7.4/ && \ - chmod -R g=u /etc/apache2/ /etc/php/7.4/ && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.1/ && \ + chgrp -R 0 /etc/apache2/ /etc/php/8.1/ && \ + chmod -R g=u /etc/apache2/ /etc/php/8.1/ && \ apt-get -y autoremove && \ apt-get -y clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index 3a437b103..35b5e2b0d 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -37,14 +37,13 @@ RUN set -eux && \ mysql-client \ nginx \ locales \ - php7.4-bcmath \ - php7.4-fpm \ - php7.4-gd \ - php7.4-json \ - php7.4-ldap \ - php7.4-mbstring \ - php7.4-mysql \ - php7.4-xml \ + php8.1-bcmath \ + php8.1-fpm \ + php8.1-gd \ + php8.1-ldap \ + php8.1-mbstring \ + php8.1-mysql \ + php8.1-xml \ supervisor" && \ INSTALL_TEMP_PKGS="gpg \ ca-certificates \ @@ -93,9 +92,9 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/nginx/ && \ - rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ + rm -f /etc/php/8.1/fpm/pool.d/www.conf && \ ln -sf /dev/fd/2 /var/log/nginx/error.log && \ - rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \ + rm -f /etc/php/8.1/fpm/php-fpm.conf.dpkg-dist && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -113,9 +112,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \ - chgrp -R 0 /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \ - chmod -R g=u /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ + chgrp -R 0 /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ + chmod -R g=u /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf similarity index 65% rename from Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf index e2471b98b..4713c9c5b 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/7.4/fpm/pool.d/*.conf +include=/etc/php/8.1/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index a9d1d16c8..1a70143a5 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/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:php-fpm7.4] -command = /usr/sbin/%(program_name)s -F -y /etc/php/7.4/fpm/php-fpm.conf +[program:php-fpm8.1] +command = /usr/sbin/%(program_name)s -F -y /etc/php/8.1/fpm/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 2faf6325f..1fb592426 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -143,7 +143,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php/7.4/fpm/pool.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php/8.1/fpm/pool.d/zabbix.conf" export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"} export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 9875d3255..843d55da4 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION @@ -36,14 +36,13 @@ RUN set -eux && \ curl \ nginx \ locales \ - php7.4-bcmath \ - php7.4-fpm \ - php7.4-gd \ - php7.4-json \ - php7.4-ldap \ - php7.4-mbstring \ - php7.4-xml \ - php7.4-pgsql \ + php8.1-bcmath \ + php8.1-fpm \ + php8.1-gd \ + php8.1-ldap \ + php8.1-mbstring \ + php8.1-xml \ + php8.1-pgsql \ postgresql-client \ supervisor" && \ INSTALL_TEMP_PKGS="gpg \ @@ -93,9 +92,9 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/nginx/ && \ - rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ + rm -f /etc/php/8.1/fpm/pool.d/www.conf && \ ln -sf /dev/fd/2 /var/log/nginx/error.log && \ - rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \ + rm -f /etc/php/8.1/fpm/php-fpm.conf.dpkg-dist && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -113,9 +112,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \ - chgrp -R 0 /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \ - chmod -R g=u /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ + chgrp -R 0 /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ + chmod -R g=u /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf similarity index 65% rename from Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf index e2471b98b..4713c9c5b 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/7.4/fpm/pool.d/*.conf +include=/etc/php/8.1/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index a9d1d16c8..1a70143a5 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/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:php-fpm7.4] -command = /usr/sbin/%(program_name)s -F -y /etc/php/7.4/fpm/php-fpm.conf +[program:php-fpm8.1] +command = /usr/sbin/%(program_name)s -F -y /etc/php/8.1/fpm/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 1aa2d48ae..ba7c49528 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -142,7 +142,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php/7.4/fpm/pool.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php/8.1/fpm/pool.d/zabbix.conf" export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"} export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"} diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index eb0450f49..c36b4312e 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM ubuntu:focal +FROM ubuntu:jammy ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index b5fc6a788..48ad68cc2 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -4,14 +4,14 @@ services: build: context: ./Dockerfiles/build-base/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy image: zabbix-build-base:ubuntu-local zabbix-build-mysql: build: context: ./Dockerfiles/build-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local image: zabbix-build-mysql:ubuntu-local @@ -22,7 +22,7 @@ services: build: context: ./Dockerfiles/build-sqlite3/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local image: zabbix-build-sqlite3:ubuntu-local @@ -35,7 +35,7 @@ services: build: context: ./Dockerfiles/server-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-server-mysql:ubuntu-local @@ -105,7 +105,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:ubuntu-local image: zabbix-proxy-sqlite3:ubuntu-local @@ -160,7 +160,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-proxy-mysql:ubuntu-local @@ -225,7 +225,7 @@ services: build: context: ./Dockerfiles/web-apache-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-web-apache-mysql:ubuntu-local @@ -287,7 +287,7 @@ services: build: context: ./Dockerfiles/web-nginx-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-web-nginx-mysql:ubuntu-local @@ -347,7 +347,7 @@ services: build: context: ./Dockerfiles/agent/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-agent:ubuntu-local @@ -394,7 +394,7 @@ services: build: context: ./Dockerfiles/java-gateway/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-java-gateway:ubuntu-local @@ -431,7 +431,7 @@ services: build: context: ./Dockerfiles/snmptraps/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy image: zabbix-snmptraps:ubuntu-local profiles: - full @@ -464,7 +464,7 @@ services: build: context: ./Dockerfiles/web-service/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-web-service:ubuntu-local diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 85f3c0c63..80078430e 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -4,14 +4,14 @@ services: build: context: ./Dockerfiles/build-base/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy image: zabbix-build-base:ubuntu-local zabbix-build-pgsql: build: context: ./Dockerfiles/build-pgsql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local image: zabbix-build-pgsql:ubuntu-local @@ -22,7 +22,7 @@ services: build: context: ./Dockerfiles/build-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local image: zabbix-build-mysql:ubuntu-local @@ -35,7 +35,7 @@ services: build: context: ./Dockerfiles/build-sqlite3/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local image: zabbix-build-sqlite3:ubuntu-local @@ -48,7 +48,7 @@ services: build: context: ./Dockerfiles/server-pgsql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-server-pgsql:ubuntu-local @@ -116,7 +116,7 @@ services: build: context: ./Dockerfiles/proxy-sqlite3/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-sqlite3:ubuntu-local image: zabbix-proxy-sqlite3:ubuntu-local @@ -171,7 +171,7 @@ services: build: context: ./Dockerfiles/proxy-mysql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local image: zabbix-proxy-mysql:ubuntu-local @@ -233,7 +233,7 @@ services: build: context: ./Dockerfiles/web-apache-pgsql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-web-apache-pgsql:ubuntu-local @@ -295,7 +295,7 @@ services: build: context: ./Dockerfiles/web-nginx-pgsql/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-web-nginx-pgsql:ubuntu-local @@ -355,7 +355,7 @@ services: build: context: ./Dockerfiles/agent/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-agent:ubuntu-local @@ -402,7 +402,7 @@ services: build: context: ./Dockerfiles/java-gateway/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-java-gateway:ubuntu-local @@ -439,7 +439,7 @@ services: build: context: ./Dockerfiles/snmptraps/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy image: zabbix-snmptraps:ubuntu-local profiles: - full @@ -472,7 +472,7 @@ services: build: context: ./Dockerfiles/web-service/ubuntu cache_from: - - ubuntu:focal + - ubuntu:jammy args: BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local image: zabbix-web-service:ubuntu-local