Skip to content

Commit 0d0d640

Browse files
Update contributor image to Ubuntu 22.04.
1 parent d09627a commit 0d0d640

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

docker-contributor/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ARCH=
2-
FROM "${ARCH}ubuntu:focal"
2+
FROM "${ARCH}ubuntu:jammy"
33
LABEL maintainer="DOMjudge team <[email protected]>"
44

55
ENV DEBIAN_FRONTEND=noninteractive \
@@ -21,9 +21,9 @@ RUN apt update \
2121
&& apt install --no-install-recommends --no-install-suggests -y \
2222
dumb-init autoconf automake git acl \
2323
gcc g++ make zip unzip mariadb-client \
24-
nginx php7.4 php7.4-cli php7.4-fpm php7.4-zip \
25-
php7.4-gd php7.4-curl php7.4-mysql php7.4-json php7.4-intl \
26-
php7.4-gmp php7.4-xml php7.4-mbstring php7.4-xdebug php7.4-pcov \
24+
nginx php8.1 php8.1-cli php8.1-fpm php8.1-zip \
25+
php8.1-gd php8.1-curl php8.1-mysql php8.1-intl \
26+
php8.1-gmp php8.1-xml php8.1-mbstring php8.1-xdebug php8.1-pcov \
2727
bsdmainutils ntp \
2828
linuxdoc-tools linuxdoc-tools-text groff \
2929
python3-sphinx python3-sphinx-rtd-theme python3-pip fontconfig python3-yaml \
@@ -34,7 +34,7 @@ RUN apt update \
3434
supervisor apache2-utils lsb-release \
3535
libcurl4-gnutls-dev libjsoncpp-dev libmagic-dev \
3636
enscript lpr ca-certificates less vim \
37-
php-pear php-dev software-properties-common python3-pygments rst2pdf \
37+
php-pear php-dev software-properties-common python3-pygments rst2pdf gpg-agent tex-gyre \
3838
&& rm -rf /var/lib/apt/lists/*
3939

4040
# Forward nginx request and error logs to standard output/error. Also create directory for PHP-FPM socket
@@ -57,15 +57,15 @@ RUN apt update && \
5757
# Install all supported PHP versions
5858
RUN add-apt-repository ppa:ondrej/php -y && apt update
5959
RUN for VERSION in $PHPSUPPORTED; do \
60-
if [ "${VERSION}" != "7.4" ]; then \
60+
if [ "${VERSION}" != "8.1" ]; then \
6161
$APTINSTALL php${VERSION}; \
6262
fi; \
6363
done
6464
RUN PACKAGES=$(dpkg-query -f '${binary:Package}\n' -W|grep "^php.*-"); \
6565
for PACKAGE in $PACKAGES; do \
6666
PACKAGEALLVERSIONS="" && \
6767
for VERSION in $PHPSUPPORTED; do \
68-
if [ "${VERSION}" != "7.4" ]; then \
68+
if [ "${VERSION}" != "8.1" ]; then \
6969
PACKAGEALLVERSIONS="$PACKAGEALLVERSIONS php${VERSION}-${PACKAGE#php*-}"; \
7070
fi; \
7171
done; \

0 commit comments

Comments
 (0)