Merge pull request #148 from movabletype/fedora42_with_mysql93

Fedora42 with mysql93

Author: charsbar

README.md

@@ -16,7 +16,7 @@ Dockerfile to test MT.
 |fedora37|fedora:37|*5.36.1*|*8.1.25*|8.0.35|3.0.9|2023-12|
 |fedora39|fedora:39|*5.38.2|*8.2.25*|*8.0.39*|3.1.4|2024-11|
 |fedora41|fedora:41|5.40.2|*8.3.21*|8.4.5|3.2.4|-|
-|fedora42|fedora:42|*5.40.2*|*8.4.7*|*8.4.5*|3.2.4|-|
+|fedora42|fedora:42|*5.40.2*|*8.4.7*|*9.3.0*|3.2.4|-|
 |cloud6 (\*1)|centos:7|*5.28.2*|*7.4.33*|*5.7.44*|1.0.2k|-|
 |cloud7 (\*1)|rockylinux/rockylinux:9|5.38.2|8.2.28|MariaDB 10.5.27|3.2.2|-|
 

bin/update_dockerfile.pl

@@ -254,13 +254,13 @@
             GraphicsMagick => '1.3.43',
         },
         repo => {
-            mysql84 => [qw(mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel)],
+            mysql93 => [qw(mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel)],
         },
-        mysql84 => {
+        mysql93 => {
             # taken from https://dev.mysql.com/downloads/repo/yum/
-            rpm    => 'https://dev.mysql.com/get/mysql84-community-release-fc42-1.noarch.rpm',
-            enable => 'mysql-8.4-lts-community',
-            # enable => 'mysql-innovation-community',
+            rpm          => 'https://dev.mysql.com/get/mysql84-community-release-fc42-1.noarch.rpm',
+            disable      => 'mysql-8.4-lts-community',
+            enable       => 'mysql-innovation-community',
             no_weak_deps => 1,
         },
         patch     => ['Test-mysqld-1.0030', 'Crypt-DES-2.07'],
@@ -1231,7 +1231,7 @@ sub load_prereqs {
 %     if (my $fix = $conf->{$repo}{fix_release_version}) {
     sed -i -e 's/\$releasever/<%= $fix->{version} %>/' /etc/yum.repos.d/<%= $fix->{repo} %> &&\
 %     }
-    <%= $conf->{installer} // 'yum' %> -y <%= $conf->{nogpgcheck} ? '--nogpgcheck ' : '' %>--enablerepo=<%= $conf->{$repo}{enable} // $repo %><%= $conf->{$repo}{no_weak_deps} ? ' --setopt=install_weak_deps=false' : '' %> install\\
+    <%= $conf->{installer} // 'yum' %> -y <%= $conf->{nogpgcheck} ? '--nogpgcheck ' : '' %>--enablerepo=<%= $conf->{$repo}{enable} // $repo %><%= $conf->{$repo}{disable} ? ' --disablerepo='.$conf->{$repo}{disable} : '' %><%= $conf->{$repo}{no_weak_deps} ? ' --setopt=install_weak_deps=false' : '' %> install\\
 %   }
  <%= join " ", @{$conf->{repo}{$repo}} %>\\
 %   if ($conf->{$repo}{enable}) {

fedora42/Dockerfile

@@ -14,9 +14,9 @@ RUN dnf --setopt=ip_resolve=4 -y  install\
  mod_ssl vsftpd ftp memcached\
  &&\
  dnf -y install https://dev.mysql.com/get/mysql84-community-release-fc42-1.noarch.rpm &&\
-    dnf -y --enablerepo=mysql-8.4-lts-community --setopt=install_weak_deps=false install\
+    dnf -y --enablerepo=mysql-innovation-community --disablerepo=mysql-8.4-lts-community --setopt=install_weak_deps=false install\
  mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel\
- && dnf clean --enablerepo=mysql-8.4-lts-community all &&\
+ && dnf clean --enablerepo=mysql-innovation-community all &&\
  dnf -y update --skip-unavailable &&\
  dnf clean all && rm -rf /var/cache/dnf &&\
  mkdir src && cd src &&\