Bug 1896161: Update dependencies in Dockerfile (#171)

diff --git a/Dockerfile b/Dockerfile
index ad8d6272f095abccdee4ad2f12f50c288e16866a..8b6deebd514cc6307b77c462663b1806a5dcf81d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,6 @@ RUN apt-get -y install \
  libemail-mime-modifier-perl \
  libdbi-perl \
  libdbix-connector-perl \
- libdbd-mysql-perl \
  libcgi-pm-perl \
  liblocale-codes-perl \
  libmath-random-isaac-perl \
@@ -51,8 +50,8 @@ RUN apt-get -y install \
  graphviz \
  vim-common
 
-# Ubuntu22 doesn't ship a new enough Template::Toolkit, so install this one manually
-RUN cpan install Template::Toolkit
+# Ubuntu22 doesn't ship new enough versions of a few modules, so get them from CPAN
+RUN cpan install Template::Toolkit Email::Address::XS Email::Sender DBD::MariaDB
 
 WORKDIR /var/www/html
 COPY --chown=root:www-data . /var/www/html

diff --git a/Dockerfile.mariadb b/Dockerfile.mariadb
index 68256eaf53d78bd633214740ae87a7ae4d7cfb12..ee69936403acfa147db6c9d3f642ae527dd98567 100644 (file)
--- a/Dockerfile.mariadb
+++ b/Dockerfile.mariadb
@@ -1,4 +1,4 @@
-FROM mariadb:10.5.12
+FROM mariadb:10.6
 COPY docker/my.cnf /etc/my.cnf
 COPY docker/mysql /etc/mysql/conf.d
 RUN apt update && apt -y dist-upgrade

diff --git a/docker/checksetup_answers.txt b/docker/checksetup_answers.txt
index 8c28ddd34e700f34c1f6fe92c6511d6d8711ddea..1a4282232decea47b393ddd9003cdf80384d24df 100644 (file)
--- a/docker/checksetup_answers.txt
+++ b/docker/checksetup_answers.txt
@@ -4,7 +4,7 @@ $answer{'ADMIN_PASSWORD'}       = %%BZ_ADMIN_PASSWORD%%;
 $answer{'ADMIN_REALNAME'}       = %%BZ_ADMIN_REALNAME%%;
 $answer{'webservergroup'}       = 'www-data';
 $answer{'use_suexec'}           = '0';
-$answer{'db_driver'}            = 'mysql';
+$answer{'db_driver'}            = 'mariadb';
 $answer{'db_host'}              = %%BZ_DB_HOST%%;
 $answer{'db_port'}              = %%BZ_DB_PORT%%;
 $answer{'db_sock'}              = '';

diff --git a/docker/mysql/bugzilla.cnf b/docker/mysql/bugzilla.cnf
index 670385b289e77bcff8ae4211237323fd1ec64ea7..ab320b3c6416fbc9fbd1d7c0ca90ff9769f2ffba 100644 (file)
--- a/docker/mysql/bugzilla.cnf
+++ b/docker/mysql/bugzilla.cnf
@@ -2,6 +2,7 @@
 max_allowed_packet = 1G
 innodb_file_per_table = 1
 innodb_large_prefix   = 1
+innodb_file_format = Barracuda
 
 [mysql]
 max_allowed_packet = 1G