Bug 1915189: Update Dockerfile to Ubuntu 24.04 (#197)

* Updated docker base image to Ubuntu 24.04
* Cleaned up Dockerfile to make final image lighter/smaller
r=mrenvoize,justdave

diff --git a/Dockerfile b/Dockerfile
index f20d7da714e498ccdfca1f8b5866eef4f1b0ad86..2795e9f19bcf99067a8c1e36c3abff601101cbbe 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,58 +1,66 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get -y dist-upgrade
 RUN apt-get -y install \
- apache2 \
- mariadb-client \
- netcat-traditional \
- libappconfig-perl \
- libdate-calc-perl \
- libtemplate-perl \
- build-essential \
- libdatetime-timezone-perl \
- libdatetime-perl \
- libemail-address-perl \
- libemail-sender-perl \
- libemail-mime-perl \
- libemail-mime-modifier-perl \
- libdbi-perl \
- libdbix-connector-perl \
- libcgi-pm-perl \
- liblocale-codes-perl \
- libmath-random-isaac-perl \
- libmath-random-isaac-xs-perl \
- libapache2-mod-perl2 \
- libapache2-mod-perl2-dev \
- libchart-perl \
- libxml-perl \
- libxml-twig-perl \
- perlmagick \
- tzdata \
- libgd-graph-perl \
- libtemplate-plugin-gd-perl \
- libsoap-lite-perl \
- libhtml-scrubber-perl \
- libjson-rpc-perl \
- libdaemon-generic-perl \
- libtheschwartz-perl \
- libtest-taint-perl \
- libauthen-radius-perl \
- libfile-slurp-perl \
- libencode-detect-perl \
- libmodule-build-perl \
- libnet-ldap-perl \
- libauthen-sasl-perl \
- libfile-mimeinfo-perl \
- libhtml-formattext-withlinks-perl \
- libgd-dev \
- libmysqlclient-dev \
- graphviz \
- vim-common
+    apache2 \
+    graphviz \
+    libapache2-mod-perl2 \
+    libapache2-mod-perl2-dev \
+    libappconfig-perl \
+    libauthen-radius-perl \
+    libauthen-sasl-perl \
+    libcache-memcached-perl \
+    libcgi-pm-perl \
+    libchart-perl \
+    libdaemon-generic-perl \
+    libdate-calc-perl \
+    libdatetime-perl \
+    libdatetime-timezone-perl \
+    libdbi-perl \
+    libdbix-connector-perl \
+    libemail-address-perl \
+    libemail-address-xs-perl \
+    libemail-mime-modifier-perl \
+    libemail-mime-perl \
+    libemail-reply-perl \
+    libemail-sender-perl \
+    libencode-detect-perl \
+    libfile-copy-recursive-perl \
+    libfile-mimeinfo-perl \
+    libfile-slurp-perl \
+    libfile-which-perl \
+    libgd-dev \
+    libgd-graph-perl \
+    libhtml-formattext-withlinks-perl \
+    libhtml-scrubber-perl \
+    libjson-rpc-perl \
+    liblocale-codes-perl \
+    libmath-random-isaac-perl \
+    libmath-random-isaac-xs-perl \
+    libmodule-build-perl \
+    libmysqlclient-dev \
+    libnet-ldap-perl \
+    libsoap-lite-perl \
+    libtemplate-perl \
+    libtemplate-plugin-gd-perl \
+    libtest-taint-perl \
+    libtheschwartz-perl \
+    libxml-perl \
+    libxml-twig-perl \
+    mariadb-client \
+    netcat-traditional \
+    patchutils \
+    perlmagick \
+    tzdata \
+    vim-common
 
-# 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
+# Ubuntu 24 doesn't ship new enough versions of a few modules or doesn't ship them at all, so get them from CPAN
+RUN apt-get -y install build-essential && \
+    cpan install Template::Toolkit DBD::MariaDB PatchReader && \
+    rm -rf /root/.cpan && \
+    apt-get purge -y --autoremove build-essential
 
 WORKDIR /var/www/html
 COPY --chown=root:www-data . /var/www/html