Skip to content

Commit 974c80f

Browse files
charsbarcharsbar
authored
Merge pull request #151 from movabletype/amazonlinux2023
Amazonlinux2023
2 parents 90ced5b + d673380 commit 974c80f

6 files changed

Lines changed: 20 additions & 15 deletions

File tree

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Dockerfile to test MT.
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|
1717
|fedora40|fedora:40|5.38.4|8.2.28|MariaDB 10.11.11|3.2.4|-|
18-
|fedora41|fedora:41|5.40.2|*8.3.21*|8.4.5|3.2.4|-|
19-
|fedora42|fedora:42|*5.40.2*|*8.4.7*|*9.3.0*|3.2.4|-|
18+
|fedora41|fedora:41|5.40.2|*8.3.22*|8.4.5|3.2.4|-|
19+
|fedora42|fedora:42|*5.40.2*|*8.4.8*|*9.3.0*|3.2.4|-|
2020
|cloud6 (\*1)|centos:7|*5.28.2*|*7.4.33*|*5.7.44*|1.0.2k|-|
2121
|cloud7 (\*1)|rockylinux/rockylinux:9|5.38.2|8.3.21|MariaDB 10.5.27|3.2.2|-|
2222

@@ -30,14 +30,14 @@ Dockerfile to test MT.
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|
3232
|fedora39 (\*2)|fedora:39|5.38.2|*8.2.25*|*8.0.39*|3.1.4|2024-11|
33-
|rawhide|fedora:rawhide|5.40.2|8.4.7|8.4.5|3.5.0|-|
33+
|rawhide|fedora:rawhide|5.40.2|8.4.9|8.4.5|3.5.0|-|
3434
|rockylinux|rockylinux/rockylinux:9|5.32.1|8.1.32|8.0.41|3.2.2|-|
3535
|bookworm|debian:bookworm-slim|5.36.0|8.2.28|*MariaDB 10.11.11*|3.0.16|2028-06|
36-
|sid|debian:sid|5.40.1|8.4.6|MariaDB 11.8.1|3.5.0|-|
36+
|sid|debian:sid|5.40.1|8.4.8|MariaDB 11.8.2|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|-|
39-
|amazonlinux2022 (\*4)|amazonlinux:2023|5.32.1|8.3.7|MariaDB 10.5.25|3.0.8|-|
40-
|postgresql|fedora:41|5.40.2|8.3.21|Postgres 16.8|3.2.4|-|
39+
|amazonlinux2023 (\*4)|amazonlinux:2023|5.32.1|8.4.6|MariaDB 10.11.11|3.2.2|-|
40+
|postgresql|fedora:41|5.40.2|8.3.22|Postgres 16.9|3.2.4|-|
4141
|oracle (\*3)|oraclelinux:7-slim|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
4242
|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.28|MariaDB 10.3.39|1.1.1k|-|
4343

@@ -49,9 +49,9 @@ Dockerfile to test MT.
4949

5050
|image name|base image|extra packages|
5151
|-|-|-|
52-
|addons8|movabletype/test:cloud7|vsftpd 3.0.5, proftpd 1.3.8b, pureftpd 1.0.50, slapd 2.6.6|
52+
|addons8|movabletype/test:cloud7|vsftpd 3.0.5, proftpd 1.3.8b, pureftpd 1.0.50, slapd 2.6.8|
5353
|chromiumdriver|movabletype/test:bullseye|chromedriver 120.0.6099.224|
54-
|playwright|movabletype/test:bullseye|node 22.15.1, playwright 1.52.0|
54+
|playwright|movabletype/test:bullseye|node 22.17.0, playwright 1.53.1|
5555

5656
## How to update
5757

amazonlinux2022/Dockerfile renamed to amazonlinux2023/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ WORKDIR /root
55

66
RUN dnf -y --allowerasing install\
77
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\
8-
mariadb105-pam mariadb105-devel mariadb105-server mariadb105\
8+
mariadb1011-pam mariadb1011-devel mariadb1011-server mariadb1011\
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\
1111
libxml2-devel expat-devel openssl-devel openssl gmp-devel\

amazonlinux2022/docker-entrypoint.sh renamed to amazonlinux2023/docker-entrypoint.sh

File renamed without changes.

‎bin/build_all.pl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
for my $t (@{ $aliases_rev{$name} || [] }) {
5252
$tags .= " --tag movabletype/test:$t";
5353
}
54+
my $dockerfile = path("$name/Dockerfile")->slurp;
55+
my ($from) = $dockerfile =~ /^FROM (\S+)/;
56+
system("docker pull $from");
5457
system("docker build $name $tags" . ($no_cache ? " --no-cache" : "") . " 2>&1 | tee log/build_$name.log");
5558
my $log = path("log/build_$name.log")->slurp;
5659
if ($log =~ m!(naming to docker.io/movabletype/test:$name (\S+ )?done|Successfully built)!) {

‎bin/check_all.pl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@
7373
$message = colored(['red'], $message) if $fail || !$ok;
7474
diag $message;
7575
}
76+
77+
system('docker system prune -f');

‎bin/update_dockerfile.pl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -740,21 +740,21 @@
740740
make_dummy_cert => '/etc/pki/tls/certs/',
741741
phpunit => 9,
742742
},
743-
amazonlinux2022 => {
743+
amazonlinux2023 => {
744744
from => 'amazonlinux:2023',
745745
base => 'centos',
746746
yum => {
747747
_replace => {
748-
'mysql' => 'mariadb105',
749-
'mysql-server' => 'mariadb105-server',
750-
'mysql-devel' => 'mariadb105-devel',
748+
'mysql' => 'mariadb1011',
749+
'mysql-server' => 'mariadb1011-server',
750+
'mysql-devel' => 'mariadb1011-devel',
751751
ftp => '',
752752
'php-pecl-memcache' => '',
753753
'phpunit' => '',
754754
},
755755
base => [qw( which hostname glibc-langpack-ja glibc-locale-source )],
756756
server => [qw( httpd )], ## for mod_ssl
757-
db => [qw( mariadb105-pam )],
757+
db => [qw( mariadb1011-pam )],
758758
php => [qw( php-cli php-xml php-json )],
759759
},
760760
gem => {
@@ -1424,7 +1424,7 @@ sub load_prereqs {
14241424
% if ($type eq 'centos6') {
14251425
service mysqld start
14261426
service memcached start
1427-
% } elsif ($type =~ /^(?:centos7|fedora23|fedora40|oracle|oracle8|amazonlinux|amazonlinux2022)$/) {
1427+
% } elsif ($type =~ /^(?:centos7|fedora23|fedora40|oracle|oracle8|amazonlinux|amazonlinux2023)$/) {
14281428
mysql_install_db --user=mysql --skip-name-resolve --force >/dev/null
14291429
14301430
bash -c "cd /usr; mysqld_safe --user=mysql --datadir=/var/lib/mysql &"

0 commit comments

Comments
 (0)