From 56e2f10c3b7e310eee8c96108e3e9398b19a1a69 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 6 Feb 2024 16:17:41 +0900
Subject: [PATCH] Updated PHP package on all Alpine images

---
 .../web-apache-mysql/alpine/Dockerfile        | 38 +++++++++----------
 .../etc/{php81 => php83}/conf.d/99-zabbix.ini |  0
 .../web-apache-pgsql/alpine/Dockerfile        | 38 +++++++++----------
 .../etc/{php81 => php83}/conf.d/99-zabbix.ini |  0
 4 files changed, 38 insertions(+), 38 deletions(-)
 rename Dockerfiles/web-apache-mysql/alpine/conf/etc/{php81 => php83}/conf.d/99-zabbix.ini (100%)
 rename Dockerfiles/web-apache-pgsql/alpine/conf/etc/{php81 => php83}/conf.d/99-zabbix.ini (100%)

diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile
index 415920c53..97bb5a4b3 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 \
-            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" && \
+            php83-apache2 \
+            php83-bcmath \
+            php83-ctype \
+            php83-gd \
+            php83-gettext \
+            php83-json \
+            php83-ldap \
+            php83-mbstring \
+            php83-mysqli \
+            php83-session \
+            php83-simplexml \
+            php83-sockets \
+            php83-fileinfo \
+            php83-xmlreader \
+            php83-xmlwriter \
+            php83-openssl" && \
     apk add \
             --no-cache \
             --clean-protected \
@@ -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/ && \
-    chgrp -R 0 /etc/apache2/ /etc/php81/ && \
-    chmod -R g=u /etc/apache2/ /etc/php81/ && \
+    chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \
+    chgrp -R 0 /etc/apache2/ /etc/php83/ && \
+    chmod -R g=u /etc/apache2/ /etc/php83/ && \
     rm -rf /var/cache/apk/*
 
 EXPOSE 8080/TCP 8443/TCP
diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php81/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/conf.d/99-zabbix.ini
similarity index 100%
rename from Dockerfiles/web-apache-mysql/alpine/conf/etc/php81/conf.d/99-zabbix.ini
rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/conf.d/99-zabbix.ini
diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile
index d6c923898..eb1b115d0 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 \
-            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 \
+            php83-apache2 \
+            php83-bcmath \
+            php83-ctype \
+            php83-gd \
+            php83-gettext \
+            php83-json \
+            php83-ldap \
+            php83-pgsql \
+            php83-mbstring \
+            php83-session \
+            php83-simplexml \
+            php83-sockets \
+            php83-fileinfo \
+            php83-xmlreader \
+            php83-xmlwriter \
+            php83-openssl \
             postgresql-client" && \
     apk add \
             --no-cache \
@@ -97,9 +97,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/ && \
-    chgrp -R 0 /etc/apache2/ /etc/php81/ && \
-    chmod -R g=u /etc/apache2/ /etc/php81/ && \
+    chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \
+    chgrp -R 0 /etc/apache2/ /etc/php83/ && \
+    chmod -R g=u /etc/apache2/ /etc/php83/ && \
     rm -rf /var/cache/apk/*
 
 EXPOSE 8080/TCP 8443/TCP
diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php81/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/conf.d/99-zabbix.ini
similarity index 100%
rename from Dockerfiles/web-apache-pgsql/alpine/conf/etc/php81/conf.d/99-zabbix.ini
rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/conf.d/99-zabbix.ini