Merge pull request #160 from movabletype/split_config

Split config

Author: charsbar

README.md

@@ -40,7 +40,6 @@ Dockerfile to test MT.
 |rockylinux|rockylinux/rockylinux:9|5.32.1|8.1.34|8.0.44|3.5.1|-|
 |bookworm|debian:bookworm-slim|5.36.0|8.2.29|MariaDB 10.11.14|3.0.17|2028-06|
 |sid|debian:sid|5.40.1|8.4.16|MariaDB 11.8.5|3.5.4|-|
-|amazonlinux|amazonlinux:2|5.16.3|7.4.33|MariaDB 5.5.68|1.0.2k|-|
 |amazonlinux2023|amazonlinux:2023|5.32.1|8.4.14|MariaDB 10.11.13|3.2.2|-|
 |postgresql|fedora:41|5.40.3|8.3.27|Postgres 16.11|3.2.6|-|
 |oracle (\*3)|oraclelinux:9-slim|5.32.1|8.3.29|MariaDB 10.5.29|3.5.1|-|

addons8/Dockerfile

@@ -12,7 +12,9 @@ RUN dnf install -y \
  curl -kLO ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8b.tar.gz &&\
  tar xf proftpd-1.3.8b.tar.gz && cd proftpd-1.3.8b &&\
  ./configure --prefix=/usr/local --enable-dso --enable-openssl --with-pic --enable-nls --with-modules=mod_tls &&\
- make && make install && cd .. && rm -rf proftpd-*
+ make && make install && cd .. && rm -rf proftpd-* &&\
+ curl -LO https://garagehq.deuxfleurs.fr/_releases/v2.1.0/`uname -m`-unknown-linux-musl/garage &&\
+ chmod +x garage && mv garage /usr/local/bin
 
 COPY ./docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]

addons8/docker-entrypoint.sh

@@ -17,8 +17,6 @@ mysql -e "grant all privileges on mt_test.* to mt@localhost;"
 
 memcached -d -u root
 
-dockerd &
-
 if [ -f t/cpanfile ]; then
     cpanm --installdeps -n . --cpanfile=t/cpanfile
 fi

amazonlinux/Dockerfile

@@ -31,7 +31,7 @@
 );
 my %aliases_rev;
 
-my %multi_platform = map { $_ => 1 } qw( noble plucky questing );
+my %multi_platform = map { $_ => 1 } qw( noble plucky questing oracle );
 
 while (my ($alias, $name) = each %aliases) {
     $aliases_rev{$name} ||= [];

amazonlinux/docker-entrypoint.sh

@@ -8,7 +8,7 @@
 my %tags  = map { $_ => 1 } @{ $local->{jobs}{'pull-and-push'}{strategy}{matrix}{tag} // [] };
 $tags{centos6} = 1;    # special case
 
-my @branches = qw(develop support-8.8.x support-8.4.x support-8.0.x);
+my @branches = qw(develop support-8.8.x support-8.0.x);
 my @repos    = qw(movabletype movabletype-addons movabletype-plugins);
 
 my %used;