From 23cbac1e5075ae768832f3d83b18bd05042a98af Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 23 Jul 2024 18:13:50 +0900 Subject: [PATCH] Use latest available PHP version (8.2) on EL and derivatives --- Dockerfiles/web-apache-mysql/centos/Dockerfile | 6 ++++++ Dockerfiles/web-apache-mysql/ol/Dockerfile | 6 ++++++ Dockerfiles/web-apache-pgsql/centos/Dockerfile | 1 + Dockerfiles/web-apache-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 6 ++++++ Dockerfiles/web-nginx-mysql/ol/Dockerfile | 6 ++++++ Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 6 ++++++ Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 1 + Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 1 + 10 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index ce3f1b2c95..39fc57f24d 100644 --- 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 index 0f7f27ac98..13e0c125c4 100644 --- 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 index d26adb4d28..7e504338f9 100644 --- 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 index 14a1c869fa..f8b34137dd 100644 --- 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 index f19c639d94..42fae3554c 100644 --- 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 index c0ff514f69..85452526bf 100644 --- 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 index 264188a3db..72d6c0e56f 100644 --- 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 index 499057037f..2e4642df7e 100644 --- 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 index ce01a02498..13c4487bf1 100644 --- 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 index 2c50e62c8f..b1d48ac213 100644 --- 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 "*" \