Skip to content

Commit c911c1f

Browse files
charsbarcharsbar
authored
Merge pull request #149 from movabletype/fedora40_with_mariadb1011
Fedora40 with mariadb1011
2 parents 60caac6 + 1bb94dd commit c911c1f

24 files changed

Lines changed: 74 additions & 56 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ Dockerfile to test MT.
1414
|bullseye|debian:bullseye-slim|*5.32.1*|*7.4.33*|*MariaDB 10.5.28*|1.1.1w|2024-08|
1515
|fedora35|fedora:35|*5.34.1*|8.0.26|8.0.31|1.1.1q|2022-12|
1616
|fedora37|fedora:37|*5.36.1*|*8.1.25*|8.0.35|3.0.9|2023-12|
17-
|fedora39|fedora:39|*5.38.2|*8.2.25*|*8.0.39*|3.1.4|2024-11|
17+
|fedora40|fedora:40|5.38.4|8.2.28|MariaDB 10.11.11|3.2.4|-|
1818
|fedora41|fedora:41|5.40.2|*8.3.21*|8.4.5|3.2.4|-|
1919
|fedora42|fedora:42|*5.40.2*|*8.4.7*|*9.3.0*|3.2.4|-|
2020
|cloud6 (\*1)|centos:7|*5.28.2*|*7.4.33*|*5.7.44*|1.0.2k|-|
21-
|cloud7 (\*1)|rockylinux/rockylinux:9|5.38.2|8.2.28|MariaDB 10.5.27|3.2.2|-|
21+
|cloud7 (\*1)|rockylinux/rockylinux:9|5.38.2|8.3.21|MariaDB 10.5.27|3.2.2|-|
2222

2323
\*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).
2424

@@ -29,10 +29,10 @@ Dockerfile to test MT.
2929
|centos6 (\*2)|centos:6|*5.10.1*|*5.3.3*|*5.1.73*|1.0.1e|2020-11|
3030
|centos8|centos:8|5.26.3|8.0.30|8.0.26|1.1.1k|2021-12|
3131
|fedora32 (\*2)|fedora:32|*5.30.3*|7.4.19|8.0.24|1.1.1k|2021-05|
32-
|fedora40 (\*2)|fedora:40|5.38.4|8.3.20|8.0.41|3.2.4|-|
32+
|fedora39 (\*2)|fedora:39|5.38.2|*8.2.25*|*8.0.39*|3.1.4|2024-11|
3333
|rawhide|fedora:rawhide|5.40.2|8.4.7|8.4.5|3.5.0|-|
3434
|rockylinux|rockylinux/rockylinux:9|5.32.1|8.1.32|8.0.41|3.2.2|-|
35-
|bookworm|debian:bookworm-slim|5.36.0|8.2.28|*MariaDB 10.11.11*|3.0.15|2028-06|
35+
|bookworm|debian:bookworm-slim|5.36.0|8.2.28|*MariaDB 10.11.11*|3.0.16|2028-06|
3636
|sid|debian:sid|5.40.1|8.4.6|MariaDB 11.8.1|3.5.0|-|
3737
|noble|ubuntu:noble|5.38.2|8.3.6|8.4.5|3.0.13|-|
3838
|amazonlinux|amazonlinux:2|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|

‎amazonlinux/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN yum -y install\
3737
mv cpm /usr/local/bin/ &&\
3838
cpanm -v ExtUtils::ParseXS@3.51 &&\
3939
cpanm -n XML::DOM XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
40-
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.050 &&\
40+
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.052 &&\
4141
cpanm -v \
4242
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
4343
pQuery\

‎amazonlinux2022/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN dnf -y --allowerasing install\
2727
mv cpm /usr/local/bin/ &&\
2828
cpanm -v ExtUtils::ParseXS@3.51 &&\
2929
cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
30-
cpanm -v Archive::Zip@1.65 DBD::mysql@4.050 &&\
30+
cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\
3131
cpanm -v \
3232
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3333
pQuery\

‎bin/update_dockerfile.pl‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
no_test => [qw( XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver )],
3535
## cf https://rt.cpan.org/Public/Bug/Display.html?id=130525
3636
broken => [qw(
37-
Archive::Zip@1.65 DBD::mysql@4.050
37+
Archive::Zip@1.65 DBD::mysql@4.052
3838
)],
3939
# breaking EV, hence AnyEvent
4040
temporary => [qw( ExtUtils::ParseXS@3.51 )],
@@ -74,7 +74,7 @@
7474
no_test => [qw( XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver )],
7575
## cf https://rt.cpan.org/Public/Bug/Display.html?id=130525
7676
broken => [qw(
77-
Archive::Zip@1.65 DBD::mysql@4.050
77+
Archive::Zip@1.65 DBD::mysql@4.052
7878
)],
7979
# breaking EV, hence AnyEvent
8080
temporary => [qw( ExtUtils::ParseXS@3.51 )],
@@ -122,10 +122,10 @@
122122
_replace => {
123123
'mysql-server' => 'mariadb-server',
124124
'mysql-client' => 'mariadb-client',
125-
'libmysqlclient-dev' => '',
125+
'libmysqlclient-dev' => 'libmariadb-dev',
126126
'phpunit' => '',
127127
},
128-
db => [qw( libdbd-mysql-perl )],
128+
db => [qw( libdbd-mysql-perl libmariadb-dev-compat )],
129129
php => [qw( php-mbstring php-xml )],
130130
},
131131
phpunit => 11,
@@ -137,10 +137,10 @@
137137
_replace => {
138138
'mysql-server' => 'mariadb-server',
139139
'mysql-client' => 'mariadb-client',
140-
'libmysqlclient-dev' => '',
140+
'libmysqlclient-dev' => 'libmariadb-dev',
141141
'phpunit' => '',
142142
},
143-
db => [qw( libdbd-mysql-perl )],
143+
db => [qw( libdbd-mysql-perl libmariadb-dev-compat )],
144144
php => [qw( php-mbstring php-xml )],
145145
},
146146
phpunit => 9,
@@ -152,12 +152,12 @@
152152
_replace => {
153153
'mysql-server' => 'mariadb-server',
154154
'mysql-client' => 'mariadb-client',
155-
'libmysqlclient-dev' => '',
155+
'libmysqlclient-dev' => 'libmariadb-dev',
156156
'phpunit' => '',
157157
'ruby' => '',
158158
'ruby-dev' => '',
159159
},
160-
db => [qw( libdbd-mysql-perl )],
160+
db => [qw( libdbd-mysql-perl libmariadb-dev-compat )],
161161
php => [qw( php-mbstring php-xml )],
162162
},
163163
apache => {
@@ -199,8 +199,7 @@
199199
images => [qw( libomp-devel )],
200200
},
201201
cpan => {
202-
# https://github.com/DCIT/perl-CryptX/issues/118
203-
no_test => [qw( CryptX App::Prove::Plugin::MySQLPool )],
202+
no_test => [qw( App::Prove::Plugin::MySQLPool )],
204203
},
205204
remove_from_cpanfile => [qw( YAML::Syck )],
206205
patch => ['Test-mysqld-1.0030', 'Crypt-DES-2.07', 'Data-MessagePack-Stream-1.05'],
@@ -244,8 +243,7 @@
244243
images => [qw( libomp-devel )],
245244
},
246245
cpan => {
247-
# https://github.com/DCIT/perl-CryptX/issues/118
248-
no_test => [qw( CryptX App::Prove::Plugin::MySQLPool )],
246+
no_test => [qw( App::Prove::Plugin::MySQLPool )],
249247
},
250248
remove_from_cpanfile => [qw( YAML::Syck )],
251249
make_dummy_cert => '/usr/bin',
@@ -308,11 +306,17 @@
308306
base => 'centos',
309307
yum => {
310308
_replace => {
311-
'mysql' => 'community-mysql',
312-
'mysql-server' => 'community-mysql-server',
313-
'mysql-devel' => 'community-mysql-devel',
314-
'procps' => 'perl-Unix-Process',
315-
'phpunit' => '',
309+
'mysql' => 'mariadb',
310+
'mysql-server' => 'mariadb-server',
311+
'mysql-devel' => 'mariadb-devel',
312+
'procps' => 'perl-Unix-Process',
313+
'php' => '',
314+
'php-cli' => '',
315+
'php-mysqlnd' => '',
316+
'php-mbstring' => '',
317+
'php-gd' => '',
318+
'php-pecl-memcache' => '',
319+
'phpunit' => '',
316320
},
317321
base => [qw( glibc-langpack-en glibc-langpack-ja xz )],
318322
images => [qw( libomp-devel )],
@@ -323,8 +327,18 @@
323327
# package is broken for unknown reason
324328
GraphicsMagick => '1.3.43',
325329
},
330+
remi => {
331+
rpm => 'https://www.rpmfind.net/linux/remi/fedora/40/remi/x86_64/remi-release-40-1.fc40.remi.noarch.rpm',
332+
module => {
333+
reset => 'php',
334+
enable => 'php:remi-8.2',
335+
},
336+
php_version => 'php82',
337+
},
338+
repo => {
339+
remi => [qw( php php-mbstring php-mysqlnd php-gd php-pecl-memcache php-xml )],
340+
},
326341
installer => 'dnf',
327-
setcap => 1,
328342
phpunit => 11,
329343
},
330344
fedora39 => {
@@ -668,9 +682,9 @@
668682
rpm => 'https://rpms.remirepo.net/enterprise/remi-release-9.rpm',
669683
module => {
670684
reset => 'php',
671-
enable => 'php:remi-8.2',
685+
enable => 'php:remi-8.3',
672686
},
673-
php_version => 'php82',
687+
php_version => 'php83',
674688
},
675689
cloud_prereqs => 'conf/cloud_prereqs7',
676690
patch => ['Test-mysqld-1.0030'],
@@ -911,7 +925,7 @@
911925
_replace => {
912926
'App::Prove::Plugin::MySQLPool' => '',
913927
'Test::mysqld' => '',
914-
'DBD::mysql@4.050' => '',
928+
'DBD::mysql@4.052' => '',
915929
},
916930
db => [qw( DBD::Pg Test::PostgreSQL )],
917931
},

‎bookworm/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN \
77
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
88
apt-get --no-install-recommends -y install\
99
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules\
10-
libdbd-mysql-perl mariadb-server mariadb-client\
10+
libdbd-mysql-perl libmariadb-dev-compat mariadb-server mariadb-client libmariadb-dev\
1111
vim nano\
1212
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick libgd-dev libpng-dev libgif-dev libjpeg-dev libwebp-dev icc-profiles-free\
1313
libxml2-dev libgmp-dev libssl-dev\
@@ -28,7 +28,7 @@ RUN \
2828
mv cpm /usr/local/bin/ &&\
2929
cpm install -g --test --show-build-log-on-failure ExtUtils::ParseXS@3.51 &&\
3030
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
31-
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 &&\
31+
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\
3232
cpanm -v \
3333
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3434
pQuery\

‎bullseye/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN \
77
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
88
apt-get --no-install-recommends -y install\
99
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules\
10-
libdbd-mysql-perl mariadb-server mariadb-client\
10+
libdbd-mysql-perl libmariadb-dev-compat mariadb-server mariadb-client libmariadb-dev\
1111
vim nano\
1212
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick libgd-dev libpng-dev libgif-dev libjpeg-dev libwebp-dev icc-profiles-free\
1313
libxml2-dev libgmp-dev libssl-dev\
@@ -28,7 +28,7 @@ RUN \
2828
mv cpm /usr/local/bin/ &&\
2929
cpm install -g --test --show-build-log-on-failure ExtUtils::ParseXS@3.51 &&\
3030
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
31-
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 &&\
31+
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\
3232
cpanm -v \
3333
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3434
pQuery\

‎buster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN \
77
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
88
apt-get --no-install-recommends -y install\
99
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules\
10-
libdbd-mysql-perl mariadb-server mariadb-client\
10+
libdbd-mysql-perl libmariadb-dev-compat mariadb-server mariadb-client libmariadb-dev\
1111
vim nano\
1212
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick libgd-dev libpng-dev libgif-dev libjpeg-dev libwebp-dev icc-profiles-free\
1313
libxml2-dev libgmp-dev libssl-dev\
@@ -31,7 +31,7 @@ RUN \
3131
mv cpm /usr/local/bin/ &&\
3232
cpm install -g --test --show-build-log-on-failure ExtUtils::ParseXS@3.51 &&\
3333
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
34-
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 &&\
34+
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\
3535
cpanm -v \
3636
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3737
pQuery\

‎centos7/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
4444
mv cpm /usr/local/bin/ &&\
4545
cpanm -v ExtUtils::ParseXS@3.51 &&\
4646
cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
47-
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.050 &&\
47+
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.052 &&\
4848
cpanm -v \
4949
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
5050
pQuery\

‎centos8/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
4949
mv cpm /usr/local/bin/ &&\
5050
cpanm -v ExtUtils::ParseXS@3.51 &&\
5151
cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
52-
cpanm -v Archive::Zip@1.65 DBD::mysql@4.050 &&\
52+
cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\
5353
cpanm -v \
5454
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
5555
pQuery\

‎cloud6/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
5151
mv cpm /usr/local/bin/ &&\
5252
cpanm -v ExtUtils::ParseXS@3.51 &&\
5353
cpanm -n GD XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
54-
cpanm -v Starman@0.4015 Archive::Zip@1.65 DBD::mysql@4.050 &&\
54+
cpanm -v Starman@0.4015 Archive::Zip@1.65 DBD::mysql@4.052 &&\
5555
cpanm -v \
5656
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
5757
pQuery\

0 commit comments

Comments
 (0)