Skip to content

Commit

Permalink
Bug 1896161: Update dependencies in Dockerfile (#171)
Browse files Browse the repository at this point in the history
  • Loading branch information
justdave committed May 11, 2024
1 parent e50ec16 commit a5e18d6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.mariadb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker/checksetup_answers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'} = '';
Expand Down
1 change: 1 addition & 0 deletions docker/mysql/bugzilla.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a5e18d6

Please sign in to comment.