From f2d61c731ad5645a59e9769dece8854f2248764a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 31 May 2022 22:29:54 +0300 Subject: [PATCH] Updated PHP for Alpine and Oracle Linux --- .../web-apache-mysql/alpine/Dockerfile | 38 +++++++++--------- .../etc/{php8 => php81}/conf.d/99-zabbix.ini | 0 .../web-apache-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/ol/Dockerfile | 2 +- .../web-apache-pgsql/alpine/Dockerfile | 38 +++++++++--------- .../etc/{php8 => php81}/conf.d/99-zabbix.ini | 0 .../web-apache-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 40 +++++++++---------- .../conf/etc/{php8 => php81}/php-fpm.conf | 2 +- .../etc/{php8 => php81}/php-fpm.d/zabbix.conf | 0 .../supervisor/conf.d/supervisord_zabbix.conf | 4 +- .../alpine/docker-entrypoint.sh | 2 +- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 40 +++++++++---------- .../conf/etc/{php8 => php81}/php-fpm.conf | 2 +- .../etc/{php8 => php81}/php-fpm.d/zabbix.conf | 0 .../supervisor/conf.d/supervisord_zabbix.conf | 4 +- .../alpine/docker-entrypoint.sh | 2 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-service/rhel/Dockerfile | 2 +- 21 files changed, 93 insertions(+), 93 deletions(-) rename Dockerfiles/web-apache-mysql/alpine/conf/etc/{php8 => php81}/conf.d/99-zabbix.ini (100%) rename Dockerfiles/web-apache-pgsql/alpine/conf/etc/{php8 => php81}/conf.d/99-zabbix.ini (100%) rename Dockerfiles/web-nginx-mysql/alpine/conf/etc/{php8 => php81}/php-fpm.conf (66%) rename Dockerfiles/web-nginx-mysql/alpine/conf/etc/{php8 => php81}/php-fpm.d/zabbix.conf (100%) rename Dockerfiles/web-nginx-pgsql/alpine/conf/etc/{php8 => php81}/php-fpm.conf (66%) rename Dockerfiles/web-nginx-pgsql/alpine/conf/etc/{php8 => php81}/php-fpm.d/zabbix.conf (100%) diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index b9dc55964..0c4df02fe 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -35,22 +35,22 @@ RUN set -eux && \ curl \ mariadb-client \ mariadb-connector-c \ - php8-apache2 \ - php8-bcmath \ - php8-ctype \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-mysqli \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl" && \ + php81-apache2 \ + php81-bcmath \ + php81-ctype \ + php81-gd \ + php81-gettext \ + php81-json \ + php81-ldap \ + php81-mbstring \ + php81-mysqli \ + php81-session \ + php81-simplexml \ + php81-sockets \ + php81-fileinfo \ + php81-xmlreader \ + php81-xmlwriter \ + php81-openssl" && \ apk add \ --no-cache \ --clean-protected \ @@ -99,9 +99,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/php8/ && \ - chgrp -R 0 /etc/apache2/ /etc/php8/ && \ - chmod -R g=u /etc/apache2/ /etc/php8/ && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php81/ && \ + chgrp -R 0 /etc/apache2/ /etc/php81/ && \ + chmod -R g=u /etc/apache2/ /etc/php81/ && \ rm -rf /var/cache/apk/* EXPOSE 8080/TCP 8443/TCP diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php81/conf.d/99-zabbix.ini similarity index 100% rename from Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/php81/conf.d/99-zabbix.ini diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index a899fc605..eaa23c8b3 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ supervisor" && \ dnf -y install epel-release && \ dnf -y module enable mysql && \ - dnf -y module enable php:7.4 && \ + dnf -y module enable php:8.0 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index a6793a256..f3bf2ca28 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux && \ glibc-locale-source \ supervisor" && \ microdnf -y module enable mysql && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index d463db9a2..df7c690bf 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -33,22 +33,22 @@ RUN set -eux && \ INSTALL_PKGS="bash \ apache2 \ curl \ - php8-apache2 \ - php8-bcmath \ - php8-ctype \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-pgsql \ - php8-mbstring \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl \ + php81-apache2 \ + php81-bcmath \ + php81-ctype \ + php81-gd \ + php81-gettext \ + php81-json \ + php81-ldap \ + php81-pgsql \ + php81-mbstring \ + php81-session \ + php81-simplexml \ + php81-sockets \ + php81-fileinfo \ + php81-xmlreader \ + php81-xmlwriter \ + php81-openssl \ postgresql-client" && \ apk add \ --no-cache \ @@ -98,9 +98,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/php8/ && \ - chgrp -R 0 /etc/apache2/ /etc/php8/ && \ - chmod -R g=u /etc/apache2/ /etc/php8/ && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php81/ && \ + chgrp -R 0 /etc/apache2/ /etc/php81/ && \ + chmod -R g=u /etc/apache2/ /etc/php81/ && \ rm -rf /var/cache/apk/* EXPOSE 8080/TCP 8443/TCP diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php81/conf.d/99-zabbix.ini similarity index 100% rename from Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/php81/conf.d/99-zabbix.ini diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 17d0d85ed..a18f2473d 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux && \ glibc-locale-source \ supervisor" && \ dnf -y install epel-release && \ - dnf -y module enable php:7.4 && \ + dnf -y module enable php:8.0 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 16a5552ca..126ded29a 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux && \ findutils \ glibc-locale-source \ supervisor" && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 6bde27949..3d57ffdb4 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -35,22 +35,22 @@ RUN set -eux && \ mariadb-client \ mariadb-connector-c \ nginx \ - php8-bcmath \ - php8-ctype \ - php8-fpm \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-mysqli \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl \ + php81-bcmath \ + php81-ctype \ + php81-fpm \ + php81-gd \ + php81-gettext \ + php81-json \ + php81-ldap \ + php81-mbstring \ + php81-mysqli \ + php81-session \ + php81-simplexml \ + php81-sockets \ + php81-fileinfo \ + php81-xmlreader \ + php81-xmlwriter \ + php81-openssl \ supervisor" && \ apk add \ --no-cache \ @@ -79,7 +79,7 @@ RUN set -eux && \ mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php8/php-fpm.d/www.conf && \ + rm -rf /etc/php81/php-fpm.d/www.conf && \ rm -f /etc/nginx/http.d/*.conf && \ ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ cd /usr/share/zabbix/ && \ @@ -93,9 +93,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/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ + chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ + chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \ chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \ diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.conf similarity index 66% rename from Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.conf index 7cc89d0f9..94269c92e 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php8/php-fpm.d/*.conf +include=/etc/php81/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 1eb877319..961068f96 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/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-fpm8] -command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf +[program:php-fpm81] +command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index e78eec52b..b52b971bc 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -143,7 +143,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php81/php-fpm.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-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 068d8006a..6b3a77df6 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -47,7 +47,7 @@ RUN set -eux && \ glibc-locale-source \ supervisor" && \ microdnf -y module enable mysql && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 0ae6316f6..aaa40a12b 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -33,22 +33,22 @@ RUN set -eux && \ INSTALL_PKGS="bash \ curl \ nginx \ - php8-bcmath \ - php8-ctype \ - php8-fpm \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-pgsql \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl \ + php81-bcmath \ + php81-ctype \ + php81-fpm \ + php81-gd \ + php81-gettext \ + php81-json \ + php81-ldap \ + php81-mbstring \ + php81-pgsql \ + php81-session \ + php81-simplexml \ + php81-sockets \ + php81-fileinfo \ + php81-xmlreader \ + php81-xmlwriter \ + php81-openssl \ postgresql-client \ supervisor" && \ apk add \ @@ -78,7 +78,7 @@ RUN set -eux && \ mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php8/php-fpm.d/www.conf && \ + rm -rf /etc/php81/php-fpm.d/www.conf && \ rm -f /etc/nginx/http.d/*.conf && \ ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ cd /usr/share/zabbix/ && \ @@ -92,9 +92,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/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ + chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ + chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \ chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.conf similarity index 66% rename from Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.conf index 7cc89d0f9..94269c92e 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php8/php-fpm.d/*.conf +include=/etc/php81/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 1eb877319..961068f96 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/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-fpm8] -command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf +[program:php-fpm81] +command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 1b1fdc47a..7360f7b65 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -143,7 +143,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php81/php-fpm.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/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 9ddbadc15..81699b99f 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux && \ php-xml \ postgresql \ supervisor" && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index 632c4f1ff..881333892 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -15,7 +15,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - PATH=/usr/lib64/chromium-browser:$PATH \ + PATH=/usr/lib64/chromium-browser:$PATH LABEL description="Zabbix web service for performing various tasks using headless web browser" \ maintainer="alexey.pustovalov@zabbix.com" \