11ARG ARCH=
2- FROM "${ARCH}ubuntu:jammy "
2+ FROM "${ARCH}ubuntu:noble "
33LABEL maintainer="DOMjudge team <team@domjudge.org>"
44
55ENV DEBIAN_FRONTEND=noninteractive \
@@ -14,7 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
1414 FPM_MAX_CHILDREN=40 \
1515 DJ_SKIP_MAKE=0 \
1616 DJ_DB_INSTALL_BARE=0 \
17- PHPSUPPORTED="8.0 8. 1 8.2 8.3" \
17+ PHPSUPPORTED="8.1 8.2 8.3" \
1818 DEFAULTPHPVERSION="8.3" \
1919 APTINSTALL="apt install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
2020
@@ -23,9 +23,9 @@ RUN apt update \
2323 && apt install --no-install-recommends --no-install-suggests -y \
2424 dumb-init autoconf automake git acl \
2525 gcc g++ make zip unzip mariadb-client \
26- nginx php8.1 php8.1 -cli php8.1 -fpm php8.1 -zip \
27- php8.1 -gd php8.1 -curl php8.1 -mysql php8.1 -intl \
28- php8.1 -gmp php8.1 -xml php8.1 -mbstring php8.1 -xdebug php8.1 -pcov \
26+ nginx php8.3 php8.3 -cli php8.3 -fpm php8.3 -zip \
27+ php8.3 -gd php8.3 -curl php8.3 -mysql php8.3 -intl \
28+ php8.3 -gmp php8.3 -xml php8.3 -mbstring php8.3 -xdebug php8.3 -pcov \
2929 bsdmainutils ntp lsof \
3030 linuxdoc-tools linuxdoc-tools-text groff \
3131 python3-sphinx python3-sphinx-rtd-theme python3-pip fontconfig python3-yaml \
@@ -44,6 +44,8 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log \
4444 && ln -sf /dev/stderr /var/log/nginx/error.log \
4545 && mkdir -p /run/php
4646
47+ # Remove default ubuntu user
48+ RUN userdel ubuntu && groupdel ubuntu || true
4749# Set up users
4850RUN groupadd -g $GID domjudge \
4951 && useradd -u $UID -g $GID -m domjudge \
@@ -60,15 +62,15 @@ RUN apt update && \
6062# Install all supported PHP versions
6163RUN add-apt-repository ppa:ondrej/php -y && apt update
6264RUN for VERSION in $PHPSUPPORTED; do \
63- if [ "${VERSION}" != "8.1 " ]; then \
65+ if [ "${VERSION}" != "8.3 " ]; then \
6466 $APTINSTALL php${VERSION}; \
6567 fi; \
6668 done
6769RUN PACKAGES=$(dpkg-query -f '${binary:Package}\n ' -W|grep "^php.*-" ); \
6870 for PACKAGE in $PACKAGES; do \
6971 PACKAGEALLVERSIONS="" && \
7072 for VERSION in $PHPSUPPORTED; do \
71- if [ "${VERSION}" != "8.1 " ]; then \
73+ if [ "${VERSION}" != "8.3 " ]; then \
7274 PACKAGEALLVERSIONS="$PACKAGEALLVERSIONS php${VERSION}-${PACKAGE#php*-}" ; \
7375 fi; \
7476 done; \
0 commit comments