Use latest available PHP version (8.2) on EL and derivatives

zabbix · Jul 23, 2024 · 23cbac1 · 23cbac1
1 parent 8269cad
commit 23cbac1
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 2 deletions.
diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile
@@ -49,6 +49,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             glibc-locale-source \
             shadow-utils \
             supervisor" && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
         --disablerepo "*" \
         --enablerepo "extras-common" \

diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile
@@ -49,6 +49,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             findutils \
             glibc-locale-source \
             supervisor" && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "ol9_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \

diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile
@@ -61,6 +61,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --enablerepo "appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
+        php:8.2 \
         postgresql:16 && \
     microdnf -y install \
         --disablerepo "*" \

diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile
@@ -51,10 +51,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             supervisor" && \
     microdnf -y module enable \
         --disablerepo "*" \
-        --enablerepo "ol9_baseos_latest" \
         --enablerepo "ol9_appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
+        php:8.2 \
         postgresql:16 && \
     microdnf -y install \
             --disablerepo="*" \

diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile
@@ -47,6 +47,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             glibc-locale-source \
             shadow-utils \
             supervisor" && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
         --disablerepo "*" \
         --enablerepo "extras-common" \

diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile
@@ -47,6 +47,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             findutils \
             glibc-locale-source \
             supervisor" && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "ol9_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
             --disablerepo="*" \
             --enablerepo="ol9_baseos_latest" \

diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile
@@ -71,6 +71,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
     rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
     ARCH_SUFFIX="$(arch)"; \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        php:8.2 && \
     microdnf -y install \
             --disablerepo "*" \
             --enablerepo "ubi-9-baseos-rpms" \

diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
@@ -59,6 +59,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --enablerepo "appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
+        php:8.2 \
         postgresql:16 && \
     microdnf -y install \
         --disablerepo "*" \

diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@@ -49,10 +49,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             supervisor" && \
     microdnf -y module enable \
         --disablerepo "*" \
-        --enablerepo "ol9_baseos_latest" \
         --enablerepo "ol9_appstream" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
+        php:8.2 \
         postgresql:16 && \
     microdnf -y install \
             --disablerepo="*" \

diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
@@ -76,6 +76,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
         --setopt=install_weak_deps=0 \
         --setopt=keepcache=0 \
+        php:8.2 \
         postgresql:16 && \
     microdnf -y install \
             --disablerepo "*" \