From f25f0e8a47a5ba2a76209527a597cfc4b19ee739 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 27 Nov 2024 15:23:40 +0900 Subject: [PATCH 1/3] Let fedora41 use MySQL 8.4 --- bin/update_dockerfile.pl | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/bin/update_dockerfile.pl b/bin/update_dockerfile.pl index fbb1513..8513e33 100755 --- a/bin/update_dockerfile.pl +++ b/bin/update_dockerfile.pl @@ -213,9 +213,9 @@ base => 'centos', yum => { _replace => { - 'mysql' => 'community-mysql', - 'mysql-server' => 'community-mysql-server', - 'mysql-devel' => 'community-mysql-devel', + 'mysql' => '', + 'mysql-server' => '', + 'mysql-devel' => '', 'procps' => 'perl-Unix-Process', 'phpunit' => '', }, @@ -230,16 +230,15 @@ # package is broken for unknown reason GraphicsMagick => '1.3.43', }, -# repo => { -# mysql84 => [qw(mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel)], -# }, -# mysql84 => { -# rpm => 'https://dev.mysql.com/get/mysql84-community-release-fc40-1.noarch.rpm', -# enable => 'mysql-8.4-lts-community', -# }, + repo => { + mysql84 => [qw(mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel)], + }, + mysql84 => { + rpm => 'https://dev.mysql.com/get/mysql84-community-release-fc40-1.noarch.rpm', + enable => 'mysql-8.4-lts-community', + }, patch => ['Imager-1.024', 'Test-mysqld-1.0020'], installer => 'dnf', - setcap => 1, phpunit => 9, }, fedora40 => { From 7b2cfe648f1bc3feaf2ee12a35639a3edbcfcb1a Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 27 Nov 2024 15:23:50 +0900 Subject: [PATCH 2/3] Update Dockerfile --- fedora41/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fedora41/Dockerfile b/fedora41/Dockerfile index 16df2ac..e06c930 100644 --- a/fedora41/Dockerfile +++ b/fedora41/Dockerfile @@ -6,7 +6,6 @@ COPY ./patch/ /root/patch/ RUN dnf -y install\ distribution-gpg-keys glibc-langpack-en glibc-langpack-ja xz git make cmake gcc clang curl perl perl-core tar zip unzip bzip2 which perl-Unix-Process postfix\ - community-mysql-devel community-mysql-server community-mysql\ vim nano\ libomp-devel ImageMagick-perl perl-GD GraphicsMagick-perl netpbm-progs ImageMagick GraphicsMagick giflib-devel libpng-devel libjpeg-devel gd-devel libwebp-devel icc-profiles-openicc\ libxml2-devel expat-devel openssl-devel openssl gmp-devel\ @@ -14,6 +13,10 @@ RUN dnf -y install\ ruby ruby-devel\ mod_ssl vsftpd ftp memcached\ &&\ + dnf -y install https://dev.mysql.com/get/mysql84-community-release-fc40-1.noarch.rpm &&\ + dnf -y --enablerepo=mysql-8.4-lts-community 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 -y update --skip-unavailable &&\ dnf clean all && rm -rf /var/cache/dnf &&\ mkdir src && cd src &&\ @@ -21,7 +24,6 @@ RUN dnf -y install\ tar xf GraphicsMagick-1.3.43.tar.xz && cd GraphicsMagick-1.3.43 &&\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx --without-jpig --without-lcms2 --without-lzma --without-xml --without-gs --with-quantum-depth=16 && make && make install && cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ - setcap -r /usr/libexec/mysqld &&\ curl -sL https://phar.phpunit.de/phpunit-9.phar > phpunit && chmod +x phpunit &&\ mv phpunit /usr/local/bin/ &&\ (curl -sL https://raw.githubusercontent.com/axllent/mailpit/develop/install.sh | bash) &&\ From 0f96f8a8459a85a65e1ab9375668ff2cff2d8c2a Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 27 Nov 2024 15:23:56 +0900 Subject: [PATCH 3/3] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0bfa794..1dcfb8d 100644 --- a/README.md +++ b/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|-| |fedora39|fedora:39|5.38.2|*8.2.24*|8.0.39|3.1.4|-| |fedora40|fedora:40|*5.38.2*|8.3.12|*8.0.39*|3.2.2|-| -|fedora41|fedora:41|*5.40.0*|*8.3.12*|*8.0.39*|3.2.2|-| +|fedora41|fedora:41|*5.40.0*|*8.3.14*|*8.4.3*|3.2.2|-| |cloud6 (\*1)|centos:7|*5.28.2*|*7.4.33*|*5.7.44*|1.0.2k|-| |cloud7 (\*1)|rockylinux:9|5.38.2|8.2.24|MariaDB 10.5.22|3.0.7|-|