Skip to content

Commit fba9d28

Browse files
charsbarcharsbar
authored
Merge pull request #137 from movabletype/restore_addons_deps
Restore addons deps
2 parents 5788dc9 + a258f05 commit fba9d28

25 files changed

Lines changed: 45 additions & 28 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Dockerfile to test MT.
1010
|image name|base image|Perl|PHP|MySQL|OpenSSL|End of Life|
1111
|-|-|-|-|-|-|-|
1212
|centos7|centos:7|5.16.3|*7.1.33*|*MariaDB 5.5.68*|1.0.2k|2024-06|
13-
|buster|debian:buster|*5.28.1*|*7.3.31*|*MariaDB 10.3.39*|1.1.1n|2022-01|
14-
|bullseye|debian:bullseye|*5.32.1*|*7.4.33*|*MariaDB 10.5.26*|1.1.1w|-|
13+
|buster|debian:buster-slim|*5.28.1*|*7.3.31*|*MariaDB 10.3.39*|1.1.1n|2022-01|
14+
|bullseye|debian:bullseye-slim|*5.32.1*|*7.4.33*|*MariaDB 10.5.26*|1.1.1w|-|
1515
|fedora35|fedora:35|*5.34.1*|8.0.26|8.0.31|1.1.1q|-|
1616
|fedora37|fedora:37|*5.36.1*|*8.1.25*|8.0.35|3.0.9|-|
1717
|fedora39|fedora:39|5.38.2|*8.2.25*|8.0.39|3.1.4|-|
18-
|fedora40|fedora:40|*5.38.2*|8.3.14|*8.0.40*|3.2.2|-|
18+
|fedora40|fedora:40|*5.38.2*|8.3.15|*8.0.40*|3.2.2|-|
1919
|fedora41|fedora:41|*5.40.0*|*8.3.15*|*8.4.3*|3.2.2|-|
2020
|cloud6 (\*1)|centos:7|*5.28.2*|*7.4.33*|*5.7.44*|1.0.2k|-|
2121
|cloud7 (\*1)|rockylinux:9|5.38.2|8.2.27|MariaDB 10.5.22|3.2.2|-|
@@ -26,12 +26,12 @@ Dockerfile to test MT.
2626

2727
|image name|base image|Perl|PHP|MySQL|OpenSSL|End of Life|
2828
|-|-|-|-|-|-|-|
29-
|centos6 (\*2)|centos:6|*5.10.1*|*5.5.38*|*5.1.73*|1.0.1e|2020-11|
29+
|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|-|
32-
|rawhide|fedora:rawhide|5.40.0|8.4.2|8.0.40|3.2.2|-|
32+
|rawhide|fedora:rawhide|5.40.0|8.4.3|8.0.40|3.2.2|-|
3333
|rockylinux|rockylinux:9|5.32.1|8.1.31|8.0.36|3.2.2|-|
34-
|bookworm|debian:bookworm|5.36.0|8.2.26|*MariaDB 10.11.6*|3.0.15|-|
34+
|bookworm|debian:bookworm-slim|5.36.0|8.2.26|*MariaDB 10.11.6*|3.0.15|-|
3535
|sid|debian:sid|5.40.0|8.4.2|MariaDB 11.4.4|3.3.2|-|
3636
|noble|ubuntu:noble|5.38.2|8.3.6|8.4.3|3.0.13|-|
3737
|amazonlinux|amazonlinux:2|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|

‎amazonlinux/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN yum -y install\
3838
cpanm -n XML::DOM XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
3939
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
4040
cpanm -v \
41+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
4142
pQuery\
4243
JSON::XS Starman Plack::Middleware::ReverseProxy\
4344
JavaScript::Minifier CSS::Minifier\

‎amazonlinux2022/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN dnf -y --allowerasing install\
2828
cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
2929
cpanm -v Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
3030
cpanm -v \
31+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3132
pQuery\
3233
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
3334
JavaScript::Minifier CSS::Minifier\

‎bin/checker.t‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,18 @@ ok $phpinfo =~ /(?:
141141
)/x, "$image_name: PHP has mbstring";
142142
ok $phpinfo =~ /PDO drivers => .*?mysql/, "$image_name: PHP has PDO mysql driver";
143143
ok $phpinfo =~ /GD Support => enabled/, "$image_name: PHP has GD";
144-
ok $phpinfo =~ /DOM.XML => enabled/, "$image_name: PHP has DOM/XML";
144+
SKIP: {
145+
local $TODO = 'php for CentOS6 does not support DOM/XML' if $image_name =~ /centos6/;
146+
ok $phpinfo =~ /DOM.XML => enabled/, "$image_name: PHP has DOM/XML";
147+
}
145148
ok $phpinfo =~ /GIF Read Support => enabled/, "$image_name: PHP supports GIF read";
146149
ok $phpinfo =~ /GIF Create Support => enabled/, "$image_name: PHP supports GIF create";
147150
ok $phpinfo =~ /JPEG Support => enabled/, "$image_name: PHP supports JPEG";
148151
ok $phpinfo =~ /PNG Support => enabled/, "$image_name: PHP supports PNG";
149-
ok $phpinfo =~ /WebP Support => enabled/, "$image_name: PHP supports WebP";
152+
SKIP: {
153+
local $TODO = 'php for CentOS6 does not support WebP' if $image_name =~ /centos6/;
154+
ok $phpinfo =~ /WebP Support => enabled/, "$image_name: PHP supports WebP";
155+
}
150156
SKIP: {
151157
local $TODO = 'Memcache may not be supported' if $image_name =~ /amazonlinux|oracle|centos8/;
152158
ok $phpinfo =~ /memcache support => enabled/, "$image_name: PHP supports memcache";

‎bin/update_dockerfile.pl‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
HTTP::Message@6.46
4141
)],
4242
extra => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
43+
addons => [qw(
44+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir
45+
Net::LDAP Linux::Pid Data::Section::Simple
46+
)],
4347
bcompat => [qw( pQuery )],
4448
make_mt => [qw( JavaScript::Minifier CSS::Minifier )],
4549
temp => [qw( Fluent::Logger )],
@@ -77,6 +81,10 @@
7781
HTTP::Message@6.46
7882
)],
7983
extra => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
84+
addons => [qw(
85+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir
86+
Net::LDAP Linux::Pid Data::Section::Simple
87+
)],
8088
bcompat => [qw( pQuery )],
8189
make_mt => [qw( JavaScript::Minifier CSS::Minifier )],
8290
temp => [qw( Fluent::Logger )],
@@ -359,12 +367,6 @@
359367
'php-mysqlnd' => 'php-mysql',
360368
'GraphicsMagick' => '',
361369
'GraphicsMagick-perl' => '',
362-
'php' => '',
363-
'php-cli' => '',
364-
'php-mysqlnd' => '',
365-
'php-mbstring' => '',
366-
'php-gd' => '',
367-
'php-pecl-memcache' => '',
368370
'phpunit' => '',
369371
'libwebp-devel' => '',
370372
'icc-profiles-openicc' => '',
@@ -376,16 +378,10 @@
376378
},
377379
repo => {
378380
epel => [qw( GraphicsMagick-perl GraphicsMagick libwebp-devel clang )],
379-
remi => [qw( php55-php php55-php-mbstring php55-php-mysqlnd php55-php-gd php55-php-pecl-memcache php55-php-xml )],
380381
},
381382
epel => {
382383
rpm => 'epel-release',
383384
},
384-
remi => {
385-
rpm => 'https://rpms.remirepo.net/enterprise/remi-release-6.rpm',
386-
enable => 'remi,remi-php55',
387-
php_version => 'php55',
388-
},
389385
cpan => {
390386
no_test => [qw(
391387
CryptX

‎bookworm/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RUN \
2929
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
3030
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
3131
cpanm -v \
32+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3233
pQuery\
3334
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
3435
JavaScript::Minifier CSS::Minifier\

‎bullseye/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RUN \
2929
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
3030
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
3131
cpanm -v \
32+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3233
pQuery\
3334
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
3435
JavaScript::Minifier CSS::Minifier\

‎buster/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN \
3232
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
3333
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
3434
cpanm -v \
35+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3536
pQuery\
3637
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
3738
JavaScript::Minifier CSS::Minifier\

‎centos6/Dockerfile‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
1111
vim nano\
1212
ImageMagick-perl perl-GD netpbm-progs ImageMagick giflib-devel libpng-devel libjpeg-devel gd-devel\
1313
perl-XML-Parser libxml2-devel expat-devel openssl-devel openssl gmp-devel\
14+
php php-mysql php-gd php-mbstring php-pecl-memcache\
1415
mod_ssl vsftpd ftp memcached\
1516
&&\
1617
yum -y install epel-release &&\
@@ -19,19 +20,12 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
1920
yum -y --enablerepo=epel install\
2021
GraphicsMagick-perl GraphicsMagick libwebp-devel clang\
2122
&&\
22-
yum -y install https://rpms.remirepo.net/enterprise/remi-release-6.rpm &&\
23-
sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-* &&\
24-
sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-* &&\
25-
yum -y --enablerepo=remi,remi-php55 install\
26-
php55-php php55-php-mbstring php55-php-mysqlnd php55-php-gd php55-php-pecl-memcache php55-php-xml\
27-
&& yum clean --enablerepo=remi,remi-php55 all &&\
2823
yum -y update --skip-broken &&\
2924
yum clean all && rm -rf /var/cache/yum &&\
3025
mkdir src && cd src &&\
3126
curl -LO https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.8.tar.gz && tar xf ruby-2.7.8.tar.gz &&\
3227
cd ruby-2.7.8 && ./configure --enable-shared --disable-install-doc && make -j4 && make install && cd .. &&\
3328
cd .. && rm -rf src && ldconfig /usr/local/lib &&\
34-
ln -s /usr/bin/php55 /usr/local/bin/php &&\
3529
curl -sL https://phar.phpunit.de/phpunit-4.phar > phpunit && chmod +x phpunit &&\
3630
mv phpunit /usr/local/bin/ &&\
3731
(curl -sL https://raw.githubusercontent.com/axllent/mailpit/develop/install.sh | bash) &&\
@@ -45,6 +39,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
4539
cpanm --no-lwp -n CryptX XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
4640
cpanm --no-lwp -v Test::MockModule@v0.176.0 Data::OptList@0.113 Sub::Exporter@0.990 Data::Section@0.200007 Software::License@0.104004 Test::Deep@1.130 Email::MIME::ContentType@1.026 Email::MIME::Encodings@1.315 Email::MessageID@1.406 Email::Date::Format@1.005 Email::Simple@2.217 Email::MIME@1.952 Data::OptList@0.112 Sub::Exporter@0.987 IO::Socket::IP@0.41 Mixin::Linewise::Readers@0.108 Pod::Eventual@0.094001 Pod::Coverage::TrustPod@0.100005 Math::GMP@2.22 Mojolicious@8.43 JSON::Validator@4.25 Plack@1.0050 DBD::SQLite SQL::Translator@1.63 HTML::TreeBuilder::LibXML@0.26 Mouse@2.5.10 Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
4741
cpanm --no-lwp -v \
42+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
4843
pQuery\
4944
JSON::XS Starman Plack::Middleware::ReverseProxy\
5045
JavaScript::Minifier CSS::Minifier\

‎centos7/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
4545
cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
4646
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
4747
cpanm -v \
48+
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
4849
pQuery\
4950
JSON::XS Starman Plack::Middleware::ReverseProxy\
5051
JavaScript::Minifier CSS::Minifier\

0 commit comments

Comments
 (0)