Switch to headless JDK

This is what the manual now suggests, and it's more consistent with
dj_make_chroot which uses default-jre-headless.

debian/control

@@ -48,7 +48,7 @@ Depends: domjudge-common (= ${source:Version}), php-cli,
  php-json, php-curl, php-xml, php-zip, procps,
  adduser, lsb-base, unzip,
  ${shlibs:Depends}, ${misc:Depends}
-Recommends: ntp, sudo, debootstrap, gcc, g++, default-jdk-headless | default-jdk
+Recommends: ntp, sudo, debootstrap, gcc, g++, default-jdk-headless
 Suggests: ghc, fp-compiler
 Conflicts: apport
 Description: programming contest jury system (judgehost)

docker-contributor/Dockerfile

@@ -32,7 +32,7 @@ RUN apt-get update \
     texlive-latex-recommended texlive-latex-extra \
     texlive-fonts-recommended texlive-lang-european latexmk \
     sudo debootstrap libcgroup-dev procps \
-    default-jre-headless default-jdk \
+    default-jre-headless default-jdk-headless \
     supervisor apache2-utils lsb-release \
     libcurl4-gnutls-dev libjsoncpp-dev libmagic-dev \
     enscript lpr ca-certificates less vim \

docker-gitlabci/Dockerfile

@@ -5,7 +5,7 @@ ENV APTINSTALL="apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::O
 RUN apt-get update && apt-get install -y \
   acl make zip unzip apache2-utils bsdmainutils libcurl4-gnutls-dev \
   libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
-  gcc g++ default-jre-headless default-jdk ghc fp-compiler libcgroup-dev \
+  gcc g++ default-jre-headless default-jdk-headless ghc fp-compiler libcgroup-dev \
   devscripts shellcheck nginx libboost-regex-dev composer codespell \
   php8.3 php8.3-cli php8.3-gd php8.3-curl php8.3-mysql php8.3-gmp php8.3-zip php8.3-xml php8.3-mbstring php8.3-fpm php8.3-intl php8.3-pcov \
   # Submit client \

docker/judgehost/Dockerfile

@@ -17,7 +17,7 @@ RUN apt-get update \
 	acl lsof zip unzip supervisor sudo procps libcgroup2 \
 	php-cli php-zip php-gd php-curl php-mysql php-json \
 	php-gmp php-xml php-mbstring python3 \
-	gcc g++ default-jre-headless default-jdk ghc fp-compiler \
+	gcc g++ default-jre-headless default-jdk-headless ghc fp-compiler \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Add chroot and judgehost data

live-image/install.sh

@@ -106,7 +106,7 @@ EOF
 apt-get install -q -y \
 	apt-transport-https \
 	openssh-server mariadb-server apache2 sudo php-zip \
-	gcc g++ default-jdk default-jre-headless fp-compiler \
+	gcc g++ default-jre-headless default-jdk-headless fp-compiler \
 	python-minimal python3-minimal gnat gfortran mono-mcs \
 	ntp debootstrap cgroup-bin libcgroup1 \
 	enscript lpr zip unzip mlocate