Merge pull request #131 from movabletype/update_imager_and_test_mysqld

Update imager and test mysqld
movabletype · Dec 2, 2024 · 2874011 · 2874011
2 parents 45ecfbd + 00b6f16
commit 2874011
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 110 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,11 @@ Dockerfile to test MT.
 |bullseye|debian:bullseye|*5.32.1*|*7.4.33*|*MariaDB 10.5.26*|1.1.1w|-|
 |fedora35|fedora:35|*5.34.1*|8.0.26|8.0.31|1.1.1q|-|
 |fedora37|fedora:37|*5.36.1*|*8.1.25*|8.0.35|3.0.9|-|
-|fedora39|fedora:39|5.38.2|*8.2.24*|8.0.39|3.1.4|-|
-|fedora40|fedora:40|*5.38.2*|8.3.12|*8.0.39*|3.2.2|-|
+|fedora39|fedora:39|5.38.2|*8.2.25*|8.0.39|3.1.4|-|
+|fedora40|fedora:40|*5.38.2*|8.3.14|*8.0.40*|3.2.2|-|
 |fedora41|fedora:41|*5.40.0*|*8.3.14*|*8.4.3*|3.2.2|-|
 |cloud6 (\*1)|centos:7|*5.28.2*|*7.4.33*|*5.7.44*|1.0.2k|-|
-|cloud7 (\*1)|rockylinux:9|5.38.2|8.2.24|MariaDB 10.5.22|3.0.7|-|
+|cloud7 (\*1)|rockylinux:9|5.38.2|8.2.26|MariaDB 10.5.22|3.2.2|-|
 
 \*1 These images are not used in the MT cloud, but the well-known modules should have the same version (except for those used only in tests).
 
@@ -29,9 +29,9 @@ Dockerfile to test MT.
 |centos6 (\*2)|centos:6|*5.10.1*|*5.5.38*|*5.1.73*|1.0.1e|2020-11|
 |centos8|centos:8|5.26.3|*8.0.30*|8.0.26|1.1.1k|2021-12|
 |fedora32 (\*2)|fedora:32|*5.30.3*|7.4.19|8.0.24|1.1.1k|-|
-|rawhide|fedora:rawhide|5.40.0|8.4.0|8.0.39|3.2.2|-|
-|rockylinux|rockylinux:9|5.32.1|8.1.30|8.0.36|3.0.7|-|
-|bookworm|debian:bookworm|5.36.0|8.2.24|*MariaDB 10.11.6*|3.0.14|-|
+|rawhide|fedora:rawhide|5.40.0|8.4.1|8.0.40|3.2.2|-|
+|rockylinux|rockylinux:9|5.32.1|8.1.31|8.0.36|3.2.2|-|
+|bookworm|debian:bookworm|5.36.0|8.2.26|*MariaDB 10.11.6*|3.0.15|-|
 |sid|debian:sid|5.40.0|8.2.24|MariaDB 11.4.3|3.3.2|-|
 |noble|ubuntu:noble|5.38.2|8.3.6|8.4.3|3.0.13|-|
 |amazonlinux|amazonlinux:2|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
@@ -48,4 +48,4 @@ Dockerfile to test MT.
 |-|-|-|
 |addons8|movabletype/test:cloud7|vsftpd 3.0.5, proftpd 1.3.8b, pureftpd 1.0.50, slapd 2.6.6|
 |chromiumdriver|movabletype/test:bullseye|chromedriver 120.0.6099.224|
-|playwright|movabletype/test:bullseye|node 20.18.0, playwright 1.48.1|
+|playwright|movabletype/test:bullseye|node 22.11.0, playwright 1.49.0|
diff --git a/bin/update_dockerfile.pl b/bin/update_dockerfile.pl
@@ -106,7 +106,6 @@
         cpan => {
             no_test => [qw( GD )],
         },
-        patch => ['Imager-1.024'],
         phpunit => 9,
     },
     bookworm => {
@@ -175,7 +174,7 @@
         cpan => {
             no_test => [qw(GD)],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         phpunit => 9,
     },
     rawhide => {
@@ -195,13 +194,12 @@
         cpan => {
             no_test => [qw( App::Prove::Plugin::MySQLPool )],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         make_dummy_cert => '/usr/bin',
         make => {
             # package is broken for unknown reason
             GraphicsMagick => '1.3.43',
         },
-        patch => ['Imager-1.024'],
         installer => 'dnf',
         setcap    => 1,
         phpunit => 9,
@@ -234,10 +232,12 @@
             mysql84 => [qw(mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel)],
         },
         mysql84 => {
-            rpm => 'https://dev.mysql.com/get/mysql84-community-release-fc40-1.noarch.rpm',
+            # taken from https://dev.mysql.com/downloads/repo/yum/
+            rpm => 'https://dev.mysql.com/get/mysql84-community-release-fc41-1.noarch.rpm',
             enable => 'mysql-8.4-lts-community',
+            # enable => 'mysql-innovation-community',
         },
-        patch => ['Imager-1.024', 'Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         installer => 'dnf',
         phpunit => 9,
     },
@@ -255,7 +255,7 @@
             base => [qw( glibc-langpack-en glibc-langpack-ja xz )],
             images => [qw( libomp-devel )],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         make_dummy_cert => '/usr/bin',
         make => {
             # package is broken for unknown reason
@@ -279,7 +279,7 @@
             base => [qw( glibc-langpack-en glibc-langpack-ja xz )],
             images => [qw( libomp-devel )],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         make_dummy_cert => '/usr/bin',
         make => {
             # package is broken for unknown reason
@@ -302,7 +302,7 @@
             },
             base => [qw( glibc-langpack-en glibc-langpack-ja )],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         make_dummy_cert => '/usr/bin',
         installer => 'dnf',
         setcap    => 1,
@@ -321,7 +321,7 @@
             },
             base => [qw( glibc-langpack-en glibc-langpack-ja )],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         make_dummy_cert => '/usr/bin',
         installer => 'dnf',
         setcap    => 1,
@@ -553,7 +553,7 @@
             remi => [qw( php php-mbstring php-mysqlnd php-gd php-pecl-memcache php-xml )],
             crb  => [qw( mysql-devel giflib-devel )],
         },
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         installer               => 'dnf',
         setcap                  => 1,
         make_dummy_cert => '/usr/bin',
@@ -674,7 +674,7 @@
             php_version => 'php82',
         },
         cloud_prereqs => 'conf/cloud_prereqs7',
-        patch => ['Test-mysqld-1.0020'],
+        patch => ['Test-mysqld-1.0030'],
         installer => 'dnf',
         make_dummy_cert => '/usr/bin',
         allow_erasing => 1,
@@ -753,64 +753,6 @@
         phpunit => 9,
         locale_def => 1,
     },
-    oracle => {
-        from => 'oraclelinux:7-slim',
-        base => 'centos',
-        yum  => {
-            _replace => {
-                'mysql' => 'mariadb',
-                'mysql-server' => 'mariadb-server',
-                'mysql-devel'  => 'mariadb-devel',
-                'php' => '',
-                'php-gd' => '',
-                'php-mysqlnd' => '',
-                'php-mbstring' => '',
-                'php-pecl-memcache' => '',
-                'phpunit' => '',
-                'giflib-devel' => '',
-                'gd-devel' => '',
-                'libwebp-devel' => '',
-                'GraphicsMagick' => '',
-                'GraphicsMagick-perl' => '',
-                'icc-profiles-openicc' => '',
-                'ruby' => '',
-                'ruby-devel' => '',
-                'clang' => '',
-            },
-            base   => [qw( which )],
-            server => [qw( httpd )],
-        },
-        epel => {
-            rpm => 'oracle-epel-release-el7',
-            enable => 'ol7_developer_EPEL',
-        },
-        ol7_developer_php74 => {
-            rpm => 'oracle-php-release-el7',
-            enable => 'ol7_developer_php74',
-        },
-        instantclient => {
-            rpm => 'https://download.oracle.com/otn_software/linux/instantclient/217000/oracle-instantclient-basic-21.7.0.0.0-1.x86_64.rpm',
-        },
-        repo => {
-            ol7_optional_latest => [qw( gd-devel giflib-devel libwebp-devel libstdc++-static )],
-            ol7_developer_php74 => [qw( php php-mysqlnd php-gd php-mbstring phpunit php-oci8-21c )],
-            epel => [qw( GraphicsMagick-perl-1.3.32-1.el7 clang )],
-        },
-        cpan => {
-            no_test => [qw( DBI Test::NoWarnings )],
-            missing => [qw( DBD::Oracle )],
-            broken => [qw( SQL::[email protected] )],
-            _replace => {
-                'Imager::File::WEBP' => '',   # libwebp for oracle is too old (0.3.0 as of this writing)
-            },
-        },
-        make => {
-            ruby => '2.7.8',
-        },
-        make_dummy_cert => '/etc/pki/tls/certs/',
-        phpunit => 9,
-        release => 19.6,
-    },
     oracle8 => {
         from => 'oraclelinux:8-slim',
         base => 'centos',

diff --git a/cloud7/Dockerfile b/cloud7/Dockerfile
@@ -50,7 +50,7 @@ RUN dnf -y --allowerasing install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  Net::LibIDN AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid AnyEvent::FTP Capture::Tiny Class::Method::Modifiers Data::Section::Simple\

diff --git a/fedora35/Dockerfile b/fedora35/Dockerfile
@@ -29,7 +29,7 @@ RUN dnf -y  install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/fedora37/Dockerfile b/fedora37/Dockerfile
@@ -29,7 +29,7 @@ RUN dnf -y  install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/fedora39/Dockerfile b/fedora39/Dockerfile
@@ -34,7 +34,7 @@ RUN dnf -y  install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/fedora40/Dockerfile b/fedora40/Dockerfile
@@ -34,7 +34,7 @@ RUN dnf -y  install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/fedora41/Dockerfile b/fedora41/Dockerfile
@@ -13,7 +13,7 @@ RUN dnf -y  install\
  ruby ruby-devel\
  mod_ssl vsftpd ftp memcached\
  &&\
- dnf -y install https://dev.mysql.com/get/mysql84-community-release-fc40-1.noarch.rpm &&\
+ dnf -y install https://dev.mysql.com/get/mysql84-community-release-fc41-1.noarch.rpm &&\
     dnf -y --enablerepo=mysql-8.4-lts-community install\
  mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel\
  && dnf clean --enablerepo=mysql-8.4-lts-community all &&\
@@ -36,8 +36,7 @@ RUN dnf -y  install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n App::Prove::Plugin::MySQLPool XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Imager-1.024 && cpanm --installdeps . && cpanm . && cd /root &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/noble/Dockerfile b/noble/Dockerfile
@@ -36,7 +36,7 @@ RUN \
  mv cpm /usr/local/bin/ &&\
  cpm install -g --show-build-log-on-failure GD XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpm install -g --test --show-build-log-on-failure Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/patch/Imager-1.024/ft_has_ps_glyph_names.patch b/patch/Imager-1.024/ft_has_ps_glyph_names.patch
diff --git a/...ld-1.0020/Test-mysqld-wait-for-stop.patch → ...ld-1.0030/Test-mysqld-wait-for-stop.patch b/...ld-1.0020/Test-mysqld-wait-for-stop.patch → ...ld-1.0030/Test-mysqld-wait-for-stop.patch
@@ -1,5 +1,5 @@
-diff --git a/patch/Test-mysqld-1.0020/lib/Test/mysqld.pm b/patch/Test-mysqld-1.0020/lib/Test/mysqld.pm
-index 62b860d..09f5ba0 100644
+diff --git a/lib/Test/mysqld.pm b/lib/Test/mysqld.pm
+index ba39690..031385e 100644
 --- a/lib/Test/mysqld.pm
 +++ b/lib/Test/mysqld.pm
 @@ -9,7 +9,7 @@ use Cwd;
@@ -10,8 +10,8 @@ index 62b860d..09f5ba0 100644
 +use POSIX qw(SIGTERM WNOHANG SIGKILL);
  use Time::HiRes qw(sleep);
 
- our $VERSION = '1.0020';
-@@ -179,7 +179,11 @@ sub wait_for_stop {
+ my $driver = 'mysql';
+@@ -195,7 +195,11 @@ sub wait_for_stop {
      my $self = shift;
      local $?; # waitpid may change this value :/
 

diff --git a/rawhide/Dockerfile b/rawhide/Dockerfile
@@ -34,7 +34,7 @@ RUN dnf -y --nogpgcheck  install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n App::Prove::Plugin::MySQLPool XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Imager-1.024 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/rockylinux/Dockerfile b/rockylinux/Dockerfile
@@ -41,7 +41,7 @@ RUN dnf -y --allowerasing install\
  mv cpm /usr/local/bin/ &&\
  cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpanm -v Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Test-mysqld-1.0020 && cpanm --installdeps . && cpanm . && cd /root &&\
+      cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\
     rm -rf /root/patch &&\
  cpanm -v \
  pQuery\

diff --git a/sid/Dockerfile b/sid/Dockerfile
@@ -2,8 +2,6 @@ FROM debian:sid
 
 WORKDIR /root
 
-COPY ./patch/ /root/patch/
-
 RUN \
  apt-get update &&\
  DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
@@ -30,8 +28,6 @@ RUN \
  mv cpm /usr/local/bin/ &&\
  cpm install -g --show-build-log-on-failure GD XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
  cpm install -g --test --show-build-log-on-failure Archive::[email protected] DBD::[email protected] HTTP::[email protected] &&\
-      cd /root/patch/Imager-1.024 && cpanm --installdeps . && cpanm . && cd /root &&\
-    rm -rf /root/patch &&\
  cpanm -v \
  pQuery\
  JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\