Skip to content

Commit 304d0f0

Browse files
charsbarcharsbar
authored
Merge pull request #143 from movabletype/sasl
Add files for Authen::SASL::XS and etc
2 parents a5df3de + a521a1f commit 304d0f0

44 files changed

Lines changed: 125 additions & 98 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ Dockerfile to test MT.
1111
|-|-|-|-|-|-|-|
1212
|centos7|centos:7|5.16.3|*7.1.33*|*MariaDB 5.5.68*|1.0.2k|2024-06|
1313
|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|-|
14+
|bullseye|debian:bullseye-slim|*5.32.1*|*7.4.33*|*MariaDB 10.5.28*|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.15|*8.0.40*|3.2.2|-|
19-
|fedora41|fedora:41|*5.40.0*|*8.3.15*|*8.4.3*|3.2.2|-|
18+
|fedora40|fedora:40|*5.38.3*|8.3.17|*8.0.40*|3.2.4|-|
19+
|fedora41|fedora:41|*5.40.1*|*8.3.19*|*8.4.4*|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.27|MariaDB 10.5.22|3.2.2|-|
21+
|cloud7 (\*1)|rockylinux/rockylinux:9|5.38.2|8.2.28|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,16 +29,16 @@ 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|-|
32-
|rawhide|fedora:rawhide|5.40.0|8.4.3|8.0.40|3.2.2|-|
33-
|rockylinux|rockylinux/rockylinux:9|5.32.1|8.1.31|8.0.36|3.2.2|-|
32+
|rawhide|fedora:rawhide|5.40.1|8.4.5|8.0.41|3.2.4|-|
33+
|rockylinux|rockylinux/rockylinux:9|5.32.1|8.1.32|8.0.41|3.2.2|-|
3434
|bookworm|debian:bookworm-slim|5.36.0|8.2.26|*MariaDB 10.11.6*|3.0.15|-|
35-
|sid|debian:sid|5.40.0|8.4.2|MariaDB 11.4.4|3.3.2|-|
36-
|noble|ubuntu:noble|5.38.2|8.3.6|8.4.3|3.0.13|-|
35+
|sid|debian:sid|5.40.1|8.4.5|MariaDB 11.4.5|3.4.1|-|
36+
|noble|ubuntu:noble|5.38.2|8.3.6|8.4.4|3.0.13|-|
3737
|amazonlinux|amazonlinux:2|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
3838
|amazonlinux2022 (\*4)|amazonlinux:2023|5.32.1|8.3.7|MariaDB 10.5.25|3.0.8|-|
39-
|postgresql|fedora:41|5.40.1|8.3.17|Postgres 16.3|3.2.4|-|
39+
|postgresql|fedora:41|5.40.1|8.3.19|Postgres 16.8|3.2.4|-|
4040
|oracle (\*3)|oraclelinux:7-slim|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
41-
|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.27|MariaDB 10.3.39|1.1.1k|-|
41+
|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.28|MariaDB 10.3.39|1.1.1k|-|
4242

4343
\*2 These images were used to test older versions of MT.
4444
\*3 with DBD::Oracle 1.80 + OracleInstantClient 21.7
@@ -50,7 +50,7 @@ Dockerfile to test MT.
5050
|-|-|-|
5151
|addons8|movabletype/test:cloud7|vsftpd 3.0.5, proftpd 1.3.8b, pureftpd 1.0.50, slapd 2.6.6|
5252
|chromiumdriver|movabletype/test:bullseye|chromedriver 120.0.6099.224|
53-
|playwright|movabletype/test:bullseye|node 22.12.0, playwright 1.49.1|
53+
|playwright|movabletype/test:bullseye|node 22.14.0, playwright 1.51.0|
5454

5555
## How to update
5656

‎amazonlinux/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /root
44

55

66
RUN yum -y install\
7-
which hostname glibc-langpack-ja git make cmake gcc clang curl perl perl-core tar zip unzip bzip2 which procps postfix\
7+
which hostname glibc-langpack-ja git make cmake gcc clang curl perl perl-core tar zip unzip bzip2 which procps postfix cyrus-sasl-devel cyrus-sasl-plain\
88
mariadb-devel mariadb-server mariadb\
99
vim nano\
1010
ImageMagick-perl perl-GD netpbm-progs ImageMagick giflib-devel libpng-devel libjpeg-devel gd-devel libwebp-devel icc-profiles-openicc\
@@ -36,11 +36,11 @@ RUN yum -y install\
3636
chmod +x cpm &&\
3737
mv cpm /usr/local/bin/ &&\
3838
cpanm -n XML::DOM XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
39-
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
39+
cpanm -v SQL::Translator@1.63 Archive::Zip@1.65 DBD::mysql@4.050 &&\
4040
cpanm -v \
4141
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
4242
pQuery\
43-
JSON::XS Starman Plack::Middleware::ReverseProxy\
43+
JSON::XS Starman Plack::Middleware::ReverseProxy Devel::CheckLib\
4444
JavaScript::Minifier CSS::Minifier\
4545
Fluent::Logger\
4646
&& curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\

‎amazonlinux/docker-entrypoint.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ if [ -f t/cpanfile ]; then
2020
cpanm --installdeps -n . --cpanfile=t/cpanfile
2121
fi
2222

23+
2324
exec "$@"

‎amazonlinux2022/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /root
44

55

66
RUN dnf -y --allowerasing install\
7-
which hostname glibc-langpack-ja glibc-locale-source git make cmake gcc clang curl perl perl-core tar zip unzip bzip2 which procps postfix\
7+
which hostname glibc-langpack-ja glibc-locale-source git make cmake gcc clang curl perl perl-core tar zip unzip bzip2 which procps postfix cyrus-sasl-devel cyrus-sasl-plain\
88
mariadb105-pam mariadb105-devel mariadb105-server mariadb105\
99
vim nano\
1010
ImageMagick-perl perl-GD GraphicsMagick-perl netpbm-progs ImageMagick GraphicsMagick giflib-devel libpng-devel libjpeg-devel gd-devel libwebp-devel icc-profiles-openicc\
@@ -26,11 +26,11 @@ RUN dnf -y --allowerasing install\
2626
chmod +x cpm &&\
2727
mv cpm /usr/local/bin/ &&\
2828
cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
29-
cpanm -v Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
29+
cpanm -v Archive::Zip@1.65 DBD::mysql@4.050 &&\
3030
cpanm -v \
3131
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3232
pQuery\
33-
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
33+
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy Devel::CheckLib\
3434
JavaScript::Minifier CSS::Minifier\
3535
Fluent::Logger\
3636
&& curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\

‎amazonlinux2022/docker-entrypoint.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ if [ -f t/cpanfile ]; then
2020
cpanm --installdeps -n . --cpanfile=t/cpanfile
2121
fi
2222

23+
2324
exec "$@"

‎bin/update_dockerfile.pl‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
apt => {
1616
base => [qw(
1717
ca-certificates netbase git make cmake gcc clang curl ssh locales perl
18-
zip unzip bzip2 procps ssl-cert postfix
18+
zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules
1919
)],
2020
images => [qw(
2121
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick
@@ -36,11 +36,8 @@
3636
broken => [qw(
3737
Archive::Zip@1.65 DBD::mysql@4.050
3838
)],
39-
# Imager 1.026 breaks Imager::File::WEBP
40-
# cf. https://github.com/tonycoz/imager/issues/538
41-
temporary => [qw( Imager@1.025 )],
42-
extra => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
43-
addons => [qw(
39+
extra => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy Devel::CheckLib )],
40+
addons => [qw(
4441
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir
4542
Net::LDAP Linux::Pid Data::Section::Simple
4643
)],
@@ -56,7 +53,7 @@
5653
yum => {
5754
base => [qw(
5855
git make cmake gcc clang curl perl perl-core
59-
tar zip unzip bzip2 which procps postfix
56+
tar zip unzip bzip2 which procps postfix cyrus-sasl-devel cyrus-sasl-plain
6057
)],
6158
images => [qw(
6259
ImageMagick-perl perl-GD GraphicsMagick-perl netpbm-progs ImageMagick GraphicsMagick
@@ -77,11 +74,8 @@
7774
broken => [qw(
7875
Archive::Zip@1.65 DBD::mysql@4.050
7976
)],
80-
# Imager 1.026 breaks Imager::File::WEBP
81-
# cf. https://github.com/tonycoz/imager/issues/538
82-
temporary => [qw( Imager@1.025 )],
83-
extra => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy )],
84-
addons => [qw(
77+
extra => [qw( JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy Devel::CheckLib )],
78+
addons => [qw(
8579
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir
8680
Net::LDAP Linux::Pid Data::Section::Simple
8781
)],
@@ -201,11 +195,13 @@
201195
images => [qw( libomp-devel )],
202196
},
203197
cpan => {
204-
no_test => [qw( App::Prove::Plugin::MySQLPool )],
198+
# https://github.com/DCIT/perl-CryptX/issues/118
199+
no_test => [qw( CryptX App::Prove::Plugin::MySQLPool )],
205200
},
206-
patch => ['Test-mysqld-1.0030', 'Crypt-DES-2.07'],
207-
make_dummy_cert => '/usr/bin',
208-
make => {
201+
remove_from_cpanfile => [qw( YAML::Syck )],
202+
patch => ['Test-mysqld-1.0030', 'Crypt-DES-2.07', 'Data-MessagePack-Stream-1.05'],
203+
make_dummy_cert => '/usr/bin',
204+
make => {
209205
# package is broken for unknown reason
210206
GraphicsMagick => '1.3.43',
211207
},

‎bookworm/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN \
66
apt-get update &&\
77
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
88
apt-get --no-install-recommends -y install\
9-
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix\
9+
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules\
1010
libdbd-mysql-perl mariadb-server mariadb-client\
1111
vim nano\
1212
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick libgd-dev libpng-dev libgif-dev libjpeg-dev libwebp-dev icc-profiles-free\
@@ -27,11 +27,11 @@ RUN \
2727
chmod +x cpm &&\
2828
mv cpm /usr/local/bin/ &&\
2929
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
30-
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
30+
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 &&\
3131
cpanm -v \
3232
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3333
pQuery\
34-
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
34+
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy Devel::CheckLib\
3535
JavaScript::Minifier CSS::Minifier\
3636
Fluent::Logger\
3737
&& curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\

‎bullseye/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN \
66
apt-get update &&\
77
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
88
apt-get --no-install-recommends -y install\
9-
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix\
9+
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules\
1010
libdbd-mysql-perl mariadb-server mariadb-client\
1111
vim nano\
1212
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick libgd-dev libpng-dev libgif-dev libjpeg-dev libwebp-dev icc-profiles-free\
@@ -27,11 +27,11 @@ RUN \
2727
chmod +x cpm &&\
2828
mv cpm /usr/local/bin/ &&\
2929
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
30-
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
30+
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 &&\
3131
cpanm -v \
3232
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3333
pQuery\
34-
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
34+
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy Devel::CheckLib\
3535
JavaScript::Minifier CSS::Minifier\
3636
Fluent::Logger\
3737
&& curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\

‎buster/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN \
66
apt-get update &&\
77
DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes\
88
apt-get --no-install-recommends -y install\
9-
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix\
9+
ca-certificates netbase git make cmake gcc clang curl ssh locales perl zip unzip bzip2 procps ssl-cert postfix libsasl2-dev libsasl2-modules\
1010
libdbd-mysql-perl mariadb-server mariadb-client\
1111
vim nano\
1212
perlmagick libgraphics-magick-perl netpbm imagemagick graphicsmagick libgd-dev libpng-dev libgif-dev libjpeg-dev libwebp-dev icc-profiles-free\
@@ -30,11 +30,11 @@ RUN \
3030
chmod +x cpm &&\
3131
mv cpm /usr/local/bin/ &&\
3232
cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
33-
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 HTTP::Message@6.46 &&\
33+
cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.050 &&\
3434
cpanm -v \
3535
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
3636
pQuery\
37-
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy\
37+
JSON::XS Starman Imager::File::WEBP Plack::Middleware::ReverseProxy Devel::CheckLib\
3838
JavaScript::Minifier CSS::Minifier\
3939
Fluent::Logger\
4040
&& curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\

‎centos6/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKDIR /root
66
RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-* &&\
77
sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-* &&\
88
yum -y install\
9-
git make cmake gcc curl perl perl-core tar zip unzip bzip2 which procps postfix\
9+
git make cmake gcc curl perl perl-core tar zip unzip bzip2 which procps postfix cyrus-sasl-devel cyrus-sasl-plain\
1010
mysql-devel mysql-server mysql\
1111
vim nano\
1212
ImageMagick-perl perl-GD netpbm-progs ImageMagick giflib-devel libpng-devel libjpeg-devel gd-devel\
@@ -37,11 +37,11 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/
3737
chmod +x cpm &&\
3838
mv cpm /usr/local/bin/ &&\
3939
cpanm --no-lwp -n CryptX XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\
40-
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 &&\
40+
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 &&\
4141
cpanm --no-lwp -v \
4242
AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\
4343
pQuery\
44-
JSON::XS Starman Plack::Middleware::ReverseProxy\
44+
JSON::XS Starman Plack::Middleware::ReverseProxy Devel::CheckLib\
4545
JavaScript::Minifier CSS::Minifier\
4646
Fluent::Logger\
4747
&& curl -sLO https://raw.githubusercontent.com/movabletype/movabletype/develop/t/cpanfile &&\

0 commit comments

Comments
 (0)