Skip to content

Switch the docker build to Ubuntu 26. #2996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drgrice1 wants to merge 2 commits into
base: WeBWorK-2.21
Choose a base branch
from
+55 −34
Open

Switch the docker build to Ubuntu 26. #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ce103
Update the docker build.
drgrice1 Apr 22, 2026
b34a341
Switch the docker build to Ubuntu 26.
drgrice1 Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \

# We need to change FROM before setting the ENV variables.

FROM ubuntu:24.04
FROM ubuntu:26.04

ENV WEBWORK_URL=/webwork2 \
WEBWORK_ROOT_URL=http://localhost:8080 \
Expand Down Expand Up @@ -79,12 +79,17 @@ RUN apt-get update \
libclass-tiny-antlers-perl \
libclass-tiny-perl \
libcpanel-json-xs-perl \
libcrypt-dev \
libcrypt-jwt-perl \
libcrypt-openssl-x509-perl \
libcryptx-perl \
libdata-dump-perl \
libdata-structure-util-perl \
libdatetime-perl \
libdatetime-format-xsd-perl \
libdatetime-hires-perl \
libdbd-mysql-perl \
libdbd-mariadb-perl \
libdevel-checklib-perl \
libemail-address-xs-perl \
libemail-date-format-perl \
Expand All @@ -98,12 +103,14 @@ RUN apt-get update \
libfile-copy-recursive-perl \
libfile-find-rule-perl-perl \
libfile-sharedir-install-perl \
libfile-slurper-perl \
libfuture-asyncawait-perl \
libgd-barcode-perl \
libgd-perl \
libhtml-scrubber-perl \
libhtml-template-perl \
libhttp-async-perl \
libio-compress-perl \
libiterator-perl \
libiterator-util-perl \
liblocale-maketext-lexicon-perl \
Expand All @@ -117,6 +124,11 @@ RUN apt-get update \
libmodule-pluggable-perl \
libmojolicious-perl \
libmojolicious-plugin-renderfile-perl \
libmoose-perl \
libmoosex-types-common-perl \
libmoosex-types-datetime-perl \
libmoosex-types-perl \
libmoosex-types-uri-perl \
libnet-https-nb-perl \
libnet-ip-perl \
libnet-ldap-perl \
Expand All @@ -130,6 +142,7 @@ RUN apt-get update \
libpod-wsdl-perl \
libsoap-lite-perl \
libsql-abstract-perl \
libssl-dev \
libstring-shellquote-perl \
libsub-uplevel-perl \
libsvg-perl \
Expand All @@ -145,9 +158,12 @@ RUN apt-get update \
libtext-csv-perl \
libthrowable-perl \
libtimedate-perl \
libtypes-serialiser-perl \
libuniversal-can-perl \
libuniversal-isa-perl \
liburi-encode-perl \
libuuid-tiny-perl \
libxml-generator-perl \
libxml-parser-easytree-perl \
libxml-parser-perl \
libxml-semanticdiff-perl \
Expand All @@ -173,19 +189,19 @@ RUN apt-get update \
texlive-science \
texlive-xetex \
tzdata \
util-linux-extra \
zlib1g-dev \
zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
&& curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
&& apt-get clean \
&& rm -fr /var/lib/apt/lists/* /tmp/*

# ==================================================================
# Phase 4 - Install additional Perl modules from CPAN that are not packaged for Ubuntu or are outdated in Ubuntu.

RUN cpanm install -n \
Statistics::R::IO \
DBD::MariaDB \
Perl::Tidy@20220613 \
RUN cpanm -n \
Perl::Tidy@20240903 \
Archive::Zip::SimpleZip \
Net::SAML2 \
&& rm -fr ./cpanm /root/.cpanm /tmp/*
Expand Down Expand Up @@ -213,9 +229,6 @@ COPY --from=base /opt/base/pg $APP_ROOT/pg
# 6. Install third party javascript files.
# 7. Apply patches

# Patch files that are applied below
COPY docker-config/pgfsys-dvisvmg-bbox-fix.patch /tmp

RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
&& mkdir /run/webwork2 /etc/ssl/local \
&& cd $APP_ROOT/webwork2/ \
Expand All @@ -225,14 +238,12 @@ RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
&& /usr/sbin/locale-gen \
&& echo "locales locales/default_environment_locale select en_US.UTF-8\ndebconf debconf/frontend select Noninteractive" > /tmp/preseed.txt \
&& debconf-set-selections /tmp/preseed.txt \
&& rm /etc/localtime /etc/timezone && echo "Etc/UTC" > /etc/timezone \
&& rm -f /etc/localtime /etc/timezone && echo "Etc/UTC" > /etc/timezone \
&& dpkg-reconfigure -f noninteractive tzdata \
&& cd $WEBWORK_ROOT/htdocs \
&& npm install \
&& cd $PG_ROOT/htdocs \
&& npm install \
&& patch -p1 -d / < /tmp/pgfsys-dvisvmg-bbox-fix.patch \
&& rm /tmp/pgfsys-dvisvmg-bbox-fix.patch
&& npm install

# ==================================================================
# Phase 7 - Final setup and prepare docker-entrypoint.sh
Expand Down
29 changes: 22 additions & 7 deletions DockerfileStage1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is the Stage 1 Dockerfile, which builds a base OS image (webwork-base)
# on top of which the WeBWorK parts will be installed by the Stage 2 Dockerfile.

FROM ubuntu:24.04
FROM ubuntu:26.04

# ==================================================================
# Phase 1 - Set base OS image install stage ENV variables
Expand Down Expand Up @@ -41,12 +41,17 @@ RUN apt-get update \
libclass-tiny-antlers-perl \
libclass-tiny-perl \
libcpanel-json-xs-perl \
libcrypt-dev \
libcrypt-jwt-perl \
libcrypt-openssl-x509-perl \
libcryptx-perl \
libdata-dump-perl \
libdata-structure-util-perl \
libdatetime-perl \
libdatetime-format-xsd-perl \
libdatetime-hires-perl \
libdbd-mysql-perl \
libdbd-mariadb-perl \
libdevel-checklib-perl \
libemail-address-xs-perl \
libemail-date-format-perl \
Expand All @@ -60,16 +65,17 @@ RUN apt-get update \
libfile-copy-recursive-perl \
libfile-find-rule-perl-perl \
libfile-sharedir-install-perl \
libfile-slurper-perl \
libfuture-asyncawait-perl \
libgd-barcode-perl \
libgd-perl \
libhtml-scrubber-perl \
libhtml-template-perl \
libhttp-async-perl \
libio-compress-perl \
libiterator-perl \
libiterator-util-perl \
liblocale-maketext-lexicon-perl \
libmariadb-dev \
libmath-random-secure-perl \
libmime-base32-perl \
libmime-tools-perl \
Expand All @@ -79,6 +85,11 @@ RUN apt-get update \
libmodule-pluggable-perl \
libmojolicious-perl \
libmojolicious-plugin-renderfile-perl \
libmoose-perl \
libmoosex-types-common-perl \
libmoosex-types-datetime-perl \
libmoosex-types-perl \
libmoosex-types-uri-perl \
libnet-https-nb-perl \
libnet-ip-perl \
libnet-ldap-perl \
Expand All @@ -92,6 +103,7 @@ RUN apt-get update \
libpod-wsdl-perl \
libsoap-lite-perl \
libsql-abstract-perl \
libssl-dev \
libstring-shellquote-perl \
libsub-uplevel-perl \
libsvg-perl \
Expand All @@ -107,9 +119,12 @@ RUN apt-get update \
libtext-csv-perl \
libthrowable-perl \
libtimedate-perl \
libtypes-serialiser-perl \
libuniversal-can-perl \
libuniversal-isa-perl \
liburi-encode-perl \
libuuid-tiny-perl \
libxml-generator-perl \
libxml-parser-easytree-perl \
libxml-parser-perl \
libxml-semanticdiff-perl \
Expand All @@ -135,19 +150,19 @@ RUN apt-get update \
texlive-science \
texlive-xetex \
tzdata \
util-linux-extra \
zlib1g-dev \
zip $ADDITIONAL_BASE_IMAGE_PACKAGES \
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
&& curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
&& apt-get install -y --no-install-recommends --no-install-suggests nodejs \
&& apt-get clean \
&& rm -fr /var/lib/apt/lists/* /tmp/*

# ==================================================================
# Phase 3 - Install additional Perl modules from CPAN that are not packaged for Ubuntu or are outdated in Ubuntu.

RUN cpanm install -n \
Statistics::R::IO \
DBD::MariaDB \
Perl::Tidy@20220613 \
RUN cpanm -n \
Perl::Tidy@20240903 \
Archive::Zip::SimpleZip \
Net::SAML2 \
&& rm -fr ./cpanm /root/.cpanm /tmp/*
Expand Down
9 changes: 2 additions & 7 deletions DockerfileStage2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ COPY --from=base /opt/base/pg $APP_ROOT/pg
# 6. Install third party javascript files.
# 7. Apply patches

# Patch files that are applied below
COPY docker-config/pgfsys-dvisvmg-bbox-fix.patch /tmp

RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
&& mkdir /run/webwork2 /etc/ssl/local \
&& cd $APP_ROOT/webwork2/ \
Expand All @@ -85,14 +82,12 @@ RUN echo "PATH=$PATH:$APP_ROOT/webwork2/bin" >> /root/.bashrc \
&& /usr/sbin/locale-gen \
&& echo "locales locales/default_environment_locale select en_US.UTF-8\ndebconf debconf/frontend select Noninteractive" > /tmp/preseed.txt \
&& debconf-set-selections /tmp/preseed.txt \
&& rm /etc/localtime /etc/timezone && echo "Etc/UTC" > /etc/timezone \
&& rm -f /etc/localtime /etc/timezone && echo "Etc/UTC" > /etc/timezone \
&& dpkg-reconfigure -f noninteractive tzdata \
&& cd $WEBWORK_ROOT/htdocs \
&& npm install \
&& cd $PG_ROOT/htdocs \
&& npm install \
&& patch -p1 -d / < /tmp/pgfsys-dvisvmg-bbox-fix.patch \
&& rm /tmp/pgfsys-dvisvmg-bbox-fix.patch
&& npm install

# ==================================================================
# Phase 5 - Final setup and prepare docker-entrypoint.sh
Expand Down
6 changes: 3 additions & 3 deletions docker-config/docker-compose.dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
db:
image: mariadb:10.4
image: mariadb:11.8

# Set a fixed container name, so it does not depend on the directory name
container_name: webwork2_db_1
Expand Down Expand Up @@ -93,12 +93,12 @@ services:
#- WEBWORK2_BRANCH=develop
#- PG_BRANCH=develop

# If you would like a 1 stage build process comment out the next line, and just run "docker-compose build".
# If you would like a 1 stage build process comment out the next line, and just run "docker compose build".
dockerfile: DockerfileStage2
# For the 2 stage build process run
# docker build --tag webwork-base:forWW221 -f DockerfileStage1 .
# and then
# docker-compose build
# docker compose build
# When rebuilding to get updated images add the "--no-cache" option to both commands.
# You can add something like
# --build-arg ADDITIONAL_BASE_IMAGE_PACKAGES="nano less"
Expand Down
8 changes: 4 additions & 4 deletions docker-config/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ if [ "$SYSTEM_TIMEZONE" != "UTC" ]; then
fi

# Modify default papersize based on environment variable PAPERSIZE
echo "Setting libpaper1 papersize to $PAPERSIZE"
echo "libpaper1 libpaper/defaultpaper select $PAPERSIZE\nlibpaper1:amd64 libpaper/defaultpaper select $PAPERSIZE\ndebconf debconf/frontend select Noninteractive" > /tmp/preseed.txt
echo "Setting libpaper2 papersize to $PAPERSIZE"
echo "libpaper2 libpaper/defaultpaper select $PAPERSIZE\nlibpaper2:amd64 libpaper/defaultpaper select $PAPERSIZE\ndebconf debconf/frontend select Noninteractive" > /tmp/preseed.txt
debconf-set-selections /tmp/preseed.txt
dpkg-reconfigure -f noninteractive libpaper1
dpkg-reconfigure -f noninteractive libpaper2

# Install some extra packages
if [ "$ADD_APT_PACKAGES" != "0" ]; then
Expand Down Expand Up @@ -102,7 +102,7 @@ if [ ! -d "$APP_ROOT/courses/admin" ]; then
umask 2
cd $APP_ROOT/courses
wait_for_db
$WEBWORK_ROOT/bin/addcourse admin --db-layout=sql_single --users=$WEBWORK_ROOT/courses.dist/adminClasslist.lst --professors=admin
$WEBWORK_ROOT/bin/addcourse admin --users=$WEBWORK_ROOT/courses.dist/adminClasslist.lst --professors=admin
chown www-data:www-data -R $APP_ROOT/courses
echo "Admin course is created."
echo "user: admin password: admin added to course admin and tables upgraded"
Expand Down
Loading