Merge pull request #1312 from zabbix/64_php83

Updated PHP version to 8.3 (Alpine)

Dockerfiles/web-apache-mysql/alpine/Dockerfile

@@ -36,22 +36,22 @@ RUN set -eux && \
             curl \
             mariadb-client \
             mariadb-connector-c \
-            php81-apache2 \
+            php83-apache2 \
-            php81-bcmath \
+            php83-bcmath \
-            php81-ctype \
+            php83-ctype \
-            php81-gd \
+            php83-gd \
-            php81-gettext \
+            php83-gettext \
-            php81-json \
+            php83-json \
-            php81-ldap \
+            php83-ldap \
-            php81-mbstring \
+            php83-mbstring \
-            php81-mysqli \
+            php83-mysqli \
-            php81-session \
+            php83-session \
-            php81-simplexml \
+            php83-simplexml \
-            php81-sockets \
+            php83-sockets \
-            php81-fileinfo \
+            php83-fileinfo \
-            php81-xmlreader \
+            php83-xmlreader \
-            php81-xmlwriter \
+            php83-xmlwriter \
-            php81-openssl" && \
+            php83-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/php81/ && \
+    chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \
-    chgrp -R 0 /etc/apache2/ /etc/php81/ && \
+    chgrp -R 0 /etc/apache2/ /etc/php83/ && \
-    chmod -R g=u /etc/apache2/ /etc/php81/
+    chmod -R g=u /etc/apache2/ /etc/php83/
 
 EXPOSE 8080/TCP 8443/TCP
 

Dockerfiles/web-apache-pgsql/alpine/Dockerfile

@@ -34,22 +34,22 @@ RUN set -eux && \
             tzdata \
             apache2 \
             curl \
-            php81-apache2 \
+            php83-apache2 \
-            php81-bcmath \
+            php83-bcmath \
-            php81-ctype \
+            php83-ctype \
-            php81-gd \
+            php83-gd \
-            php81-gettext \
+            php83-gettext \
-            php81-json \
+            php83-json \
-            php81-ldap \
+            php83-ldap \
-            php81-pgsql \
+            php83-pgsql \
-            php81-mbstring \
+            php83-mbstring \
-            php81-session \
+            php83-session \
-            php81-simplexml \
+            php83-simplexml \
-            php81-sockets \
+            php83-sockets \
-            php81-fileinfo \
+            php83-fileinfo \
-            php81-xmlreader \
+            php83-xmlreader \
-            php81-xmlwriter \
+            php83-xmlwriter \
-            php81-openssl \
+            php83-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/php81/ && \
+    chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \
-    chgrp -R 0 /etc/apache2/ /etc/php81/ && \
+    chgrp -R 0 /etc/apache2/ /etc/php83/ && \
-    chmod -R g=u /etc/apache2/ /etc/php81/
+    chmod -R g=u /etc/apache2/ /etc/php83/
 
 EXPOSE 8080/TCP 8443/TCP
 

Dockerfiles/web-nginx-mysql/alpine/Dockerfile

@@ -36,22 +36,22 @@ RUN set -eux && \
             mariadb-client \
             mariadb-connector-c \
             nginx \
-            php81-bcmath \
+            php83-bcmath \
-            php81-ctype \
+            php83-ctype \
-            php81-fpm \
+            php83-fpm \
-            php81-gd \
+            php83-gd \
-            php81-gettext \
+            php83-gettext \
-            php81-json \
+            php83-json \
-            php81-ldap \
+            php83-ldap \
-            php81-mbstring \
+            php83-mbstring \
-            php81-mysqli \
+            php83-mysqli \
-            php81-session \
+            php83-session \
-            php81-simplexml \
+            php83-simplexml \
-            php81-sockets \
+            php83-sockets \
-            php81-fileinfo \
+            php83-fileinfo \
-            php81-xmlreader \
+            php83-xmlreader \
-            php81-xmlwriter \
+            php83-xmlwriter \
-            php81-openssl \
+            php83-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/php81/php-fpm.d/www.conf && \
+    rm -rf /etc/php83/php-fpm.d/www.conf && \
     rm -f /etc/nginx/http.d/*.conf && \
     ln -sf /dev/stdout /var/log/nginx/access.log && \
     ln -sf /dev/stderr /var/log/nginx/error.log && \
@@ -94,9 +94,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/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
+    chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
-    chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
+    chgrp -R 0 /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
-    chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
+    chmod -R g=u /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/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/

Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf

@@ -1,4 +1,4 @@
-include=/etc/php81/php-fpm.d/*.conf
+include=/etc/php83/php-fpm.d/*.conf
 
 [global]
 

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-fpm81]
+[program:php-fpm83]
-command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf
+command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf
 auto_start = true
 autorestart = true
 

Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh

@@ -163,7 +163,7 @@ prepare_web_server() {
 prepare_zbx_web_config() {
     echo "** Preparing Zabbix frontend configuration file"
 
-    PHP_CONFIG_FILE="/etc/php81/php-fpm.d/zabbix.conf"
+    PHP_CONFIG_FILE="/etc/php83/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"}

Dockerfiles/web-nginx-pgsql/alpine/Dockerfile

@@ -34,22 +34,22 @@ RUN set -eux && \
             tzdata \
             curl \
             nginx \
-            php81-bcmath \
+            php83-bcmath \
-            php81-ctype \
+            php83-ctype \
-            php81-fpm \
+            php83-fpm \
-            php81-gd \
+            php83-gd \
-            php81-gettext \
+            php83-gettext \
-            php81-json \
+            php83-json \
-            php81-ldap \
+            php83-ldap \
-            php81-mbstring \
+            php83-mbstring \
-            php81-pgsql \
+            php83-pgsql \
-            php81-session \
+            php83-session \
-            php81-simplexml \
+            php83-simplexml \
-            php81-sockets \
+            php83-sockets \
-            php81-fileinfo \
+            php83-fileinfo \
-            php81-xmlreader \
+            php83-xmlreader \
-            php81-xmlwriter \
+            php83-xmlwriter \
-            php81-openssl \
+            php83-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/php81/php-fpm.d/www.conf && \
+    rm -rf /etc/php83/php-fpm.d/www.conf && \
     rm -f /etc/nginx/http.d/*.conf && \
     ln -sf /dev/stdout /var/log/nginx/access.log && \
     ln -sf /dev/stderr /var/log/nginx/error.log && \
@@ -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/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
+    chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
-    chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
+    chgrp -R 0 /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
-    chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \
+    chmod -R g=u /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/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/

Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf

@@ -1,4 +1,4 @@
-include=/etc/php81/php-fpm.d/*.conf
+include=/etc/php83/php-fpm.d/*.conf
 
 [global]
 

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-fpm81]
+[program:php-fpm83]
-command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf
+command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf
 auto_start = true
 autorestart = true
 

Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh

@@ -150,7 +150,7 @@ prepare_web_server() {
 prepare_zbx_web_config() {
     echo "** Preparing Zabbix frontend configuration file"
 
-    PHP_CONFIG_FILE="/etc/php81/php-fpm.d/zabbix.conf"
+    PHP_CONFIG_FILE="/etc/php83/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"}