Merge pull request #162 from movabletype/rockylinux96

Rockylinux96

Author: charsbar

README.md

@@ -16,7 +16,7 @@ Dockerfile to test MT.
 |fedora40|fedora:40|*5.38.4*|*8.2.30*|*MariaDB 10.11.11*|3.2.4|-|
 |fedora42|fedora:42|*5.40.3*|*8.4.16*|*9.5.0*|3.2.6|-|
 |fedora43|fedora:43|*5.42.0*|8.4.16|*8.4.7*|3.5.4|-|
-|cloud7 (\*1)|rockylinux/rockylinux:9|*5.38.2*|*8.3.29*|MariaDB 10.5.29|3.5.1|-|
+|cloud7 (\*1)|rockylinux/rockylinux:9.6|*5.38.2*|*8.3.30*|MariaDB 10.5.29|3.5.1|-|
 
 \*1 This image is not used in the MT cloud, but the well-known modules should have the same versions (except for those used only in tests).
 
@@ -37,7 +37,7 @@ Dockerfile to test MT.
 |fedora39 (\*2)|fedora:39|5.38.2|8.2.25|8.0.39|3.1.4|2024-11|
 |fedora41 (\*2)|fedora:41|5.40.3|8.3.27|8.4.7|3.2.6|-|
 |rawhide|fedora:rawhide|5.42.0|8.5.2|8.4.7|3.5.4|-|
-|rockylinux|rockylinux/rockylinux:9|5.32.1|8.1.34|8.0.44|3.5.1|-|
+|rockylinux|rockylinux/rockylinux:9.6|5.32.1|8.1.34|8.0.44|3.5.1|-|
 |bookworm|debian:bookworm-slim|5.36.0|8.2.29|MariaDB 10.11.14|3.0.17|2028-06|
 |sid|debian:sid|5.40.1|8.4.16|MariaDB 11.8.5|3.5.4|-|
 |amazonlinux2023|amazonlinux:2023|5.32.1|8.4.14|MariaDB 10.11.13|3.2.2|-|

cloud7/Dockerfile

@@ -1,4 +1,4 @@
-FROM rockylinux/rockylinux:9.5
+FROM rockylinux/rockylinux:9.6
 
 WORKDIR /root
 
@@ -55,7 +55,7 @@ RUN dnf -y --allowerasing install\
   echo "--with-jpeg" >> /usr/local/share/php-build/default_configure_options &&\
   echo "--with-webp" >> /usr/local/share/php-build/default_configure_options &&\
   echo "--with-pear" >> /usr/local/share/php-build/default_configure_options &&\
-  echo 'install_package "https://www.php.net/distributions/php-8.3.29.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\
+  echo 'install_package "https://www.php.net/distributions/php-8.3.30.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\
   php-build --verbose my_php /usr &&\
   yes | pecl install memcache &&\
   echo "extension=memcache.so" >> /usr/etc/php.ini &&\
@@ -90,7 +90,7 @@ RUN dnf -y --allowerasing install\
  curl -sL --compressed https://git.io/cpm > cpm &&\
  chmod +x cpm &&\
  mv cpm /usr/local/bin/ &&\
- cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
+ cpanm -n Starman XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\
       cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
       cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\

conf/dockerfile/cloud7.pl

@@ -1,5 +1,5 @@
 return {
-    from => 'rockylinux/rockylinux:9.5',
+    from => 'rockylinux/rockylinux:9.6',
     base => 'centos',
     yum  => {
         _replace => {
@@ -37,6 +37,7 @@
         _replace => {
             'Imager::File::AVIF' => '',
         },
+        no_test => [qw( Starman )],
     },
     phpunit => 12,
     make    => {

conf/dockerfile/rockylinux.pl

@@ -1,5 +1,5 @@
 return {
-    from => 'rockylinux/rockylinux:9.5',
+    from => 'rockylinux/rockylinux:9.6',
     base => 'centos',
     yum  => {
         _replace => {
@@ -30,7 +30,7 @@
             'Imager::File::AVIF' => '',
         },
         # for arm64
-        no_test => [qw( indirect )],
+        no_test => [qw( indirect Starman )],
     },
     epel => {
         rpm => 'epel-release',

rockylinux/Dockerfile

@@ -1,4 +1,4 @@
-FROM rockylinux/rockylinux:9.5
+FROM rockylinux/rockylinux:9.6
 
 WORKDIR /root
 
@@ -57,6 +57,8 @@ RUN dnf -y --allowerasing install\
   php-build --verbose my_php /usr &&\
   yes | pecl install memcache &&\
   echo "extension=memcache.so" >> /usr/etc/php.ini &&\
+ mkdir src && cd src &&\
+ cd .. && rm -rf src && ldconfig /usr/local/lib &&\
  setcap -r /usr/libexec/mysqld &&\
  curl -sL https://phar.phpunit.de/phpunit-10.phar > phpunit && chmod +x phpunit &&\
  mv phpunit /usr/local/bin/ &&\
@@ -71,7 +73,7 @@ RUN dnf -y --allowerasing install\
  curl -sL --compressed https://git.io/cpm > cpm &&\
  chmod +x cpm &&\
  mv cpm /usr/local/bin/ &&\
- cpanm -n indirect XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
+ cpanm -n indirect Starman XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\
       cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
       cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\