Skip to content

Commit 5c995f5

Browse files
tom93vmcj
authored andcommitted
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. Not updating debian/control and live-image/install.sh for now because they are legacy or currently untested.
1 parent 3a56ee9 commit 5c995f5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docker-contributor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apt-get update \
3232
texlive-latex-recommended texlive-latex-extra \
3333
texlive-fonts-recommended texlive-lang-european latexmk \
3434
sudo debootstrap libcgroup-dev procps \
35-
default-jre-headless default-jdk \
35+
default-jre-headless default-jdk-headless \
3636
supervisor apache2-utils lsb-release \
3737
libcurl4-gnutls-dev libjsoncpp-dev libmagic-dev \
3838
enscript lpr ca-certificates less vim \

docker-gitlabci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV APTINSTALL="apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::O
55
RUN apt-get update && apt-get install -y \
66
acl make zip unzip apache2-utils bsdmainutils libcurl4-gnutls-dev \
77
libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
8-
gcc g++ default-jre-headless default-jdk ghc fp-compiler libcgroup-dev \
8+
gcc g++ default-jre-headless default-jdk-headless ghc fp-compiler libcgroup-dev \
99
devscripts shellcheck nginx libboost-regex-dev composer codespell \
1010
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 \
1111
# Submit client \

docker/judgehost/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update \
1717
acl lsof zip unzip supervisor sudo procps libcgroup2 \
1818
php-cli php-zip php-gd php-curl php-mysql php-json \
1919
php-gmp php-xml php-mbstring python3 \
20-
gcc g++ default-jre-headless default-jdk ghc fp-compiler \
20+
gcc g++ default-jre-headless default-jdk-headless ghc fp-compiler \
2121
&& rm -rf /var/lib/apt/lists/*
2222

2323
# Add chroot and judgehost data

0 commit comments

Comments
 (0)