Merge pull request #139 from movabletype/postgresql

charsbar · web-flow · commit d498539fbea6 · 2025-02-10T10:22:03.000+09:00
Postgresql
diff --git a/README.md b/README.md
@@ -36,6 +36,7 @@ Dockerfile to test MT.
 |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|-|
 |amazonlinux2022 (\*4)|amazonlinux:2023|5.32.1|8.3.7|MariaDB 10.5.25|3.0.8|-|
+|postgresql|fedora:41|5.40.1|8.3.16|Postgres 16.3|3.2.2|-|
 |oracle (\*3)|oraclelinux:7-slim|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
 |oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.27|MariaDB 10.3.39|1.1.1k|-|
 
diff --git a/bin/checker.t b/bin/checker.t
@@ -3,10 +3,13 @@ use warnings;
 use Test::More;
 use version;
 
+my $image_name = $ENV{TEST_IMAGE};
+
+diag "\nChecking $image_name";
+
 my %prereqs = (
     'Archive::Tar'            => '',
     'Archive::Zip'            => '<= 1.65?(cloud6|cloud7|addons)',
-    'DBD::mysql'              => '4.000',
     'DBI'                     => '1.633',
     'GD'                      => 0,
     'Graphics::Magick'        => 0,
@@ -18,9 +21,11 @@ my %prereqs = (
     'IO::Socket::SSL'         => '2.058',
 );
 
-my $image_name = $ENV{TEST_IMAGE};
-
-diag "\nChecking $image_name";
+if ($image_name eq 'postgresql') {
+    $prereqs{'DBD::Pg'} = 0;
+} else {
+    $prereqs{'DBD::mysql'} = '4.000';
+}
 
 # temporary files
 
@@ -139,19 +144,23 @@ ok $phpinfo =~ /(?:
     Zend[ ]Multibyte[ ]Support[ ]=>[ ]provided[ ]by[ ]mbstring |
     mbstring[ ]extension[ ]makes[ ]use[ ]of[ ]"streamable[ ]kanji[ ]code[ ]filter[ ]and[ ]converter"
 )/x, "$image_name: PHP has mbstring";
-ok $phpinfo =~ /PDO drivers => .*?mysql/,       "$image_name: PHP has PDO mysql driver";
-ok $phpinfo =~ /GD Support => enabled/,         "$image_name: PHP has GD";
+if ($image_name eq 'postgresql') {
+    ok $phpinfo =~ /PDO drivers => .*?pgsql/, "$image_name: PHP has PDO pgsql driver";
+} else {
+    ok $phpinfo =~ /PDO drivers => .*?mysql/, "$image_name: PHP has PDO mysql driver";
+}
+ok $phpinfo =~ /GD Support => enabled/, "$image_name: PHP has GD";
 SKIP: {
     local $TODO = 'php for CentOS6 does not support DOM/XML' if $image_name =~ /centos6/;
-    ok $phpinfo =~ /DOM.XML => enabled/,            "$image_name: PHP has DOM/XML";
+    ok $phpinfo =~ /DOM.XML => enabled/, "$image_name: PHP has DOM/XML";
 }
 ok $phpinfo =~ /GIF Read Support => enabled/,   "$image_name: PHP supports GIF read";
 ok $phpinfo =~ /GIF Create Support => enabled/, "$image_name: PHP supports GIF create";
 ok $phpinfo =~ /JPEG Support => enabled/,       "$image_name: PHP supports JPEG";
 ok $phpinfo =~ /PNG Support => enabled/,        "$image_name: PHP supports PNG";
 SKIP: {
     local $TODO = 'php for CentOS6 does not support WebP' if $image_name =~ /centos6/;
-    ok $phpinfo =~ /WebP Support => enabled/,       "$image_name: PHP supports WebP";
+    ok $phpinfo =~ /WebP Support => enabled/, "$image_name: PHP supports WebP";
 }
 SKIP: {
     local $TODO = 'Memcache may not be supported' if $image_name =~ /amazonlinux|oracle|centos8/;
@@ -192,40 +201,45 @@ SKIP: {
     my ($phpunit) = (`phpunit --version` // '') =~ /PHPUnit (\d+\.\d+\.\d+)/;
     ok $phpunit, "$image_name: phpunit exists ($phpunit)";
     if ($php_version_number >= 8.2) {
-        is substr($phpunit, 0, 2) => 11, "phpunit 11 (11.x.x) for php >= 8.2 ($php_version)";
+        is substr($phpunit, 0, 2) => 11, "$image_name: phpunit 11 (11.x.x) for php >= 8.2 ($php_version)";
     } elsif ($php_version_number >= 8.1) {
-        is substr($phpunit, 0, 2) => 10, "phpunit 10 (10.x.x) for php >= 8.1 ($php_version)";
+        is substr($phpunit, 0, 2) => 10, "$image_name: phpunit 10 (10.x.x) for php >= 8.1 ($php_version)";
     } elsif ($php_version_number >= 7.3) {
-        is substr($phpunit, 0, 1) => 9, "phpunit 9 (9.5.x) for php >= 7.3 ($php_version)";
+        is substr($phpunit, 0, 1) => 9, "$image_name: phpunit 9 (9.5.x) for php >= 7.3 ($php_version)";
     } elsif ($php_version_number >= 7.2) {
-        is substr($phpunit, 0, 1) => 8, "phpunit 8 (8.5.21) for php >= 7.2 ($php_version)";
+        is substr($phpunit, 0, 1) => 8, "$image_name: phpunit 8 (8.5.21) for php >= 7.2 ($php_version)";
     } elsif ($php_version_number >= 7.1) {
-        is substr($phpunit, 0, 1) => 7, "phpunit 7 (7.5.20) for php >= 7.1 ($php_version)";
+        is substr($phpunit, 0, 1) => 7, "$image_name: phpunit 7 (7.5.20) for php >= 7.1 ($php_version)";
     } elsif ($php_version_number >= 7.0) {
-        is substr($phpunit, 0, 1) => 6, "phpunit 6 (6.5.14) for php >= 7.0 ($php_version)";
+        is substr($phpunit, 0, 1) => 6, "$image_name: phpunit 6 (6.5.14) for php >= 7.0 ($php_version)";
     } elsif ($php_version_number >= 5.6) {
-        is substr($phpunit, 0, 1) => 5, "phpunit 5 (5.7.27) for php >= 5.6 ($php_version)";
+        is substr($phpunit, 0, 1) => 5, "$image_name: phpunit 5 (5.7.27) for php >= 5.6 ($php_version)";
     } else {
-        is substr($phpunit, 0, 1) => 4, "phpunit 4 (4.8.36) for php >= 5.3 ($php_version)";
+        is substr($phpunit, 0, 1) => 4, "$image_name: phpunit 4 (4.8.36) for php >= 5.3 ($php_version)";
     }
 }
 
-my ($mysql_version, $is_maria) = `mysql --verbose --help 2>/dev/null` =~ /mysql\s+(?:from|Ver).+?(\d+\.\d+\.\d+).+?(MariaDB)?/;
-my $mysql = $is_maria ? "MariaDB" : "MySQL";
-ok $mysql_version, "$image_name: $mysql exists ($mysql_version)";
-my $sql_mode = `mysql -Nse 'select \@\@sql_mode' 2>&1`;
-note "SQL mode: $sql_mode";
-if ($sql_mode =~ /Can't connect to local MySQL/) {
-    fail "$image_name: failed to connect to local mysql" if $entrypoint_is_executed;
-}
-if ($mysql_version =~ /^5\.[567]\./ or $mysql_version =~ /^10\.[0123]\./) {
-    my ($file_format)    = `mysql -Nse 'select \@\@innodb_file_format'`    =~ /(\w+)/;
-    my ($file_per_table) = `mysql -Nse 'select \@\@innodb_file_per_table'` =~ /(\w+)/;
-    my ($large_prefix)   = `mysql -Nse 'select \@\@innodb_large_prefix'`   =~ /(\w+)/;
-    $file_format    //= '';
-    $file_per_table //= '';
-    $large_prefix   //= '';
-    note "InnoDB: file format $file_format, file per table $file_per_table, large prefix $large_prefix";
+if ($image_name eq 'postgresql') {
+    my ($postgresql_version) = `su -c 'postgres --version' postgres 2>/dev/null` =~ /postgres .+?(\d+\.\d+)/;
+    ok $postgresql_version, "$image_name: postgresql exists ($postgresql_version)";
+} else {
+    my ($mysql_version, $is_maria) = `mysql --verbose --help 2>/dev/null` =~ /mysql\s+(?:from|Ver).+?(\d+\.\d+\.\d+).+?(MariaDB)?/;
+    my $mysql = $is_maria ? "MariaDB" : "MySQL";
+    ok $mysql_version, "$image_name: $mysql exists ($mysql_version)";
+    my $sql_mode = `mysql -Nse 'select \@\@sql_mode' 2>&1`;
+    note "SQL mode: $sql_mode";
+    if ($sql_mode =~ /Can't connect to local MySQL/) {
+        fail "$image_name: failed to connect to local mysql" if $entrypoint_is_executed;
+    }
+    if ($mysql_version =~ /^5\.[567]\./ or $mysql_version =~ /^10\.[0123]\./) {
+        my ($file_format)    = `mysql -Nse 'select \@\@innodb_file_format'`    =~ /(\w+)/;
+        my ($file_per_table) = `mysql -Nse 'select \@\@innodb_file_per_table'` =~ /(\w+)/;
+        my ($large_prefix)   = `mysql -Nse 'select \@\@innodb_large_prefix'`   =~ /(\w+)/;
+        $file_format    //= '';
+        $file_per_table //= '';
+        $large_prefix   //= '';
+        note "InnoDB: file format $file_format, file per table $file_per_table, large prefix $large_prefix";
+    }
 }
 
 my ($ruby_version) = `ruby --version 2>&1` =~ /ruby (\d+\.\d+.\d+)/;
diff --git a/bin/test_readme.pl b/bin/test_readme.pl
@@ -10,7 +10,7 @@
     next if $line     =~ /^\|(?:\-|image name)/;
     $line             =~ s/(^\|)|(\|$)//g;
     $line             =~ s/\*//g;
-    $line             =~ s/MariaDB //;
+    $line             =~ s/(?:MariaDB|Postgres) //;
     my ($image, $base, @rest) = split '\|', $line;
     next if $image =~ /(?:openldap|chromedriver)/;
     if ($image =~ /(?:addons|chromiumdriver|playwright)/) {
@@ -42,7 +42,7 @@
             next;
         }
         my $wanted = $key;
-        $wanted = '(?:mysql|mariadb)' if $key eq 'mysql';
+        $wanted = '(?:mysql|mariadb|postgresql)' if $key eq 'mysql';
         my ($version) = $log =~ /$wanted exists \((.+?)\)/i;
         is $version => $mapping{$image}{$key} => "$image has correct $key";
     }
diff --git a/bin/update_dockerfile.pl b/bin/update_dockerfile.pl
@@ -33,14 +33,14 @@
             ## fragile tests, or broken by other modules (Atom, Pulp)
             no_test => [qw( XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver )],
             ## cf https://rt.cpan.org/Public/Bug/Display.html?id=130525
-            ## cf latest HTTP::Message itself is not broken but breaks HTML::Form
-            ## https://github.com/libwww-perl/HTML-Form/issues/50
             broken => [qw(
                 Archive::Zip@1.65 DBD::mysql@4.050
-                HTTP::Message@6.46
             )],
-            extra   => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
-            addons => [qw(
+            # Imager 1.026 breaks Imager::File::WEBP
+            # cf. https://github.com/tonycoz/imager/issues/538
+            temporary => [qw( Imager@1.025 )],
+            extra     => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
+            addons    => [qw(
                 AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir
                 Net::LDAP Linux::Pid Data::Section::Simple
             )],
@@ -74,14 +74,14 @@
             ## fragile tests, or broken by other modules (Atom, Pulp)
             no_test => [qw( XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver )],
             ## cf https://rt.cpan.org/Public/Bug/Display.html?id=130525
-            ## cf latest HTTP::Message itself is not broken but breaks HTML::Form
-            ## https://github.com/libwww-perl/HTML-Form/issues/50
             broken => [qw(
                 Archive::Zip@1.65 DBD::mysql@4.050
-                HTTP::Message@6.46
             )],
-            extra   => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
-            addons => [qw(
+            # Imager 1.026 breaks Imager::File::WEBP
+            # cf. https://github.com/tonycoz/imager/issues/538
+            temporary => [qw( Imager@1.025 )],
+            extra     => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
+            addons    => [qw(
                 AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir
                 Net::LDAP Linux::Pid Data::Section::Simple
             )],
@@ -888,6 +888,41 @@
         locale_def      => 1,
         no_update       => 1,
     },
+    postgresql => {
+        from => 'fedora:41',
+        base => 'centos',
+        yum  => {
+            _replace => {
+                'mysql'        => '',
+                'mysql-server' => '',
+                'mysql-devel'  => '',
+                'php-mysqlnd'  => '',
+                'procps'       => 'perl-Unix-Process',
+                'phpunit'      => '',
+            },
+            db     => [qw( postgresql postgresql-server libpq-devel )],
+            base   => [qw( distribution-gpg-keys glibc-langpack-en glibc-langpack-ja xz )],
+            images => [qw( libomp-devel )],
+            php    => [qw( php-pgsql )],
+        },
+        cpan => {
+            _replace => {
+                'App::Prove::Plugin::MySQLPool' => '',
+                'Test::mysqld'                  => '',
+                'DBD::mysql@4.050'              => '',
+            },
+            db => [qw( DBD::Pg Test::PostgreSQL )],
+        },
+        remove_from_cpanfile => [qw( DBD::mysql App::Prove::Plugin::MySQLPool )],
+        make_dummy_cert      => '/usr/bin',
+        make                 => {
+            # package is broken for unknown reason
+            GraphicsMagick => '1.3.43',
+        },
+        patch     => ['Crypt-DES-2.07'],
+        installer => 'dnf',
+        phpunit   => 11,
+    },
 );
 
 my $templates = get_data_section();
@@ -1094,6 +1129,9 @@ sub load_prereqs {
  <%= join " ", @{ $conf->{cpan}{$key} } %>\\
 % }
  && curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\\
+% if ($conf->{remove_from_cpanfile}) {
+ perl -i -nE 'print unless /(?:<%= join '|', @{$conf->{remove_from_cpanfile}} %>)/' cpanfile &&\\
+% }
 % if ($conf->{use_cpm}) {
  cpm install -g --test --show-build-log-on-failure\\
 % } else {
@@ -1195,7 +1233,7 @@ sub load_prereqs {
 %   }
 % }
 % if (!$conf->{no_update}) {
- <%= $conf->{installer} // 'yum' %> -y <%= $conf->{nogpgcheck} ? '--nogpgcheck ' : '' %>update <% if ($type =~ /(rawhide|fedora4[1-9])/) { %>--skip-unavailable<% } elsif ($type ne 'fedora23') { %>--skip-broken<% } %><% if ($conf->{no_best}) { %> --nobest<% } %> &&\\
+ <%= $conf->{installer} // 'yum' %> -y <%= $conf->{nogpgcheck} ? '--nogpgcheck ' : '' %>update <% if ($type =~ /(rawhide|fedora4[1-9]|postgresql)/) { %>--skip-unavailable<% } elsif ($type ne 'fedora23') { %>--skip-broken<% } %><% if ($conf->{no_best}) { %> --nobest<% } %> &&\\
 % }
  <%= $conf->{installer} // 'yum' %> clean all && rm -rf /var/cache/<%= $conf->{installer} // 'yum' %> &&\\
 % if ($conf->{use_legacy_policies}) {
@@ -1272,6 +1310,9 @@ sub load_prereqs {
  <%= join " ", @{ $conf->{cpan}{$key} } %>\\
 % }
  && curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\\
+% if ($conf->{remove_from_cpanfile}) {
+ perl -i -nE 'print unless /(?:<%= join '|', @{$conf->{remove_from_cpanfile}} %>)/' cpanfile &&\\
+% }
 % if ($conf->{use_cpm}) {
  cpm install -g --test --show-build-log-on-failure &&\\
 % } else {
@@ -1345,6 +1386,9 @@ sub load_prereqs {
 mysql -e "grant all privileges on mt_test.* to mt@localhost;"
 
 if [ -f t/cpanfile ]; then
+% if ($conf->{remove_from_cpanfile}) {
+    perl -i -nE 'print unless /(?:<%= join '|', @{$conf->{remove_from_cpanfile}} %>)/' t/cpanfile &&\\
+% }
     <%= $conf->{cpanm} %> --installdeps -n . --cpanfile=t/cpanfile
 fi
 
@@ -1398,19 +1442,39 @@ sub load_prereqs {
 
 % if ($type eq 'centos6') {
 mysql -e "create database if not exists mt_test character set utf8;"
-% } else {
+% } elsif ($type ne 'postgresql') {
 mysql -e "create database mt_test character set utf8;"
 % }
+% if ($type eq 'postgresql') {
+export PGDATA=/var/lib/postgresql/data
+install --verbose --directory --owner postgres --group postgres --mode 1777 /var/lib/postgresql
+install --verbose --directory --owner postgres --group postgres --mode 3777 /var/run/postgresql
+
+su -c 'initdb --show' postgres
+
+su -c 'pg_ctl -D /var/lib/postgresql/data start' postgres
+
+su -c 'createuser mt' postgres
+su -c 'createdb -O mt mt_test' postgres
+% } else {
 % if ($type ne 'centos6') {
 mysql -e "create user mt@localhost;"
 % }
 mysql -e "grant all privileges on mt_test.* to mt@localhost;"
+% }
 
 memcached -d -u root
 
 if [ -f t/cpanfile ]; then
+% if ($conf->{remove_from_cpanfile}) {
+    perl -i -nE 'print unless /(?:<%= join '|', @{$conf->{remove_from_cpanfile}} %>)/' t/cpanfile &&\\
+% }
     <%= $conf->{cpanm} %> --installdeps -n . --cpanfile=t/cpanfile
 fi
 
+% if ($type eq 'postgresql') {
+export MT_TEST_BACKEND=Pg
+% }
+
 exec "$@"
 
diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile
@@ -0,0 +1,69 @@
+FROM fedora:41
+
+WORKDIR /root
+
+COPY ./patch/ /root/patch/
+
+RUN dnf -y  install\
+ distribution-gpg-keys glibc-langpack-en glibc-langpack-ja xz git make cmake gcc clang curl perl perl-core tar zip unzip bzip2 which perl-Unix-Process postfix\
+ postgresql postgresql-server libpq-devel\
+ vim nano\
+ libomp-devel ImageMagick-perl perl-GD GraphicsMagick-perl netpbm-progs ImageMagick GraphicsMagick giflib-devel libpng-devel libjpeg-devel gd-devel libwebp-devel icc-profiles-openicc\
+ libxml2-devel expat-devel openssl-devel openssl gmp-devel\
+ php-pgsql php php-gd php-mbstring php-pecl-memcache\
+ ruby ruby-devel\
+ mod_ssl vsftpd ftp memcached\
+ &&\
+ dnf -y update --skip-unavailable &&\
+ dnf clean all && rm -rf /var/cache/dnf &&\
+ mkdir src && cd src &&\
+ curl -LO https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/1.3.43/GraphicsMagick-1.3.43.tar.xz &&\
+ tar xf GraphicsMagick-1.3.43.tar.xz && cd GraphicsMagick-1.3.43 &&\
+ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx --without-jpig --without-lcms2 --without-lzma --without-xml --without-gs --with-quantum-depth=16 && make && make install && cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\
+ cd .. && rm -rf src && ldconfig /usr/local/lib &&\
+ curl -sL https://phar.phpunit.de/phpunit-11.phar > phpunit && chmod +x phpunit &&\
+ mv phpunit /usr/local/bin/ &&\
+ (curl -sL https://raw.githubusercontent.com/axllent/mailpit/develop/install.sh | bash) &&\
+ gem install \
+  fluentd\
+ &&\
+ curl -sL https://cpanmin.us > cpanm && chmod +x cpanm && perl -pi -E 's{http://(www\.cpan\.org|backpan\.perl\.org|cpan\.metacpan\.org|fastapi\.metacpan\.org|cpanmetadb\.plackperl\.org)}{https://$1}g' cpanm && mv cpanm /usr/local/bin &&\
+ curl -sL --compressed https://git.io/cpm > cpm &&\
+ chmod +x cpm &&\
+ mv cpm /usr/local/bin/ &&\
+ cpanm -v Imager@1.025 &&\
+ cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
+ cpanm -v Archive::Zip@1.65 &&\
+      cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\
+    rm -rf /root/patch &&\
+ cpanm -v \
+ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
+ pQuery\
+ DBD::Pg Test::PostgreSQL\
+ JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
+ JavaScript::Minifier CSS::Minifier\
+ Fluent::Logger\
+ && curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\
+ perl -i -nE 'print unless /(?:DBD::mysql|App::Prove::Plugin::MySQLPool)/' cpanfile &&\
+ cpanm --installdeps -v . &&\
+ rm -rf cpanfile /root/.perl-cpm /root/.cpanm /root/.qws
+
+ENV LANG=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8
+
+RUN set -ex &&\
+  perl -i -pe \
+   's!AllowOverride None!AllowOverride All!g; s!#AddEncoding x-gzip \.gz \.tgz!AddEncoding x-gzip .gz .tgz .svgz!g;' \
+    /etc/httpd/conf/httpd.conf &&\
+  perl -e 'my ($inifile) = `php --ini` =~ m!Loaded Configuration File:\s+(/\S+/php.ini)!; \
+    my $ini = do { open my $fh, "<", $inifile; local $/; <$fh> }; \
+    $ini =~ s!^;\s*date\.timezone =!date\.timezone = "Asia/Tokyo"!m; \
+    open my $fh, ">", $inifile; print $fh $ini' &&\
+  sed -i -E 's/inet_protocols = all/inet_protocols = ipv4/' /etc/postfix/main.cf
+
+RUN cd /usr/bin && ./make-dummy-cert /etc/pki/tls/certs/localhost.crt &&\
+  perl -i -pe 's!SSLCertificateKeyFile /etc/pki/tls/private/localhost.key!!' \
+  /etc/httpd/conf.d/ssl.conf && cd $WORKDIR
+
+COPY ./docker-entrypoint.sh /
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/postgresql/docker-entrypoint.sh b/postgresql/docker-entrypoint.sh
