Skip to content

Add ppa:pypy/ppa repository in Dockerfiles of judgehost and gitlabci #205

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

Closed
wants to merge 1 commit into from
Closed

Add ppa:pypy/ppa repository in Dockerfiles of judgehost and gitlabci #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion docker-gitlabci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-0
RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-1
RUN groupadd domjudge-run

RUN apt-get update && apt-get install -y \
RUN apt-add-repository ppa:pypy/ppa -y \
apt-get update && apt-get -y install \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rather test with the old version in the gitlab ci tests, we try to test DOMjudge here not if the ppa has connection issues or if they pushed a broken package.

I think we should always test with the oldest version someone could run, not with the version we normally use ourselves.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point! And it also looks like the Docker build fails because it can't find the PPA. 😅 In that case, I'll close this PR 🙂

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-headless ghc fp-compiler libcgroup-dev \
Expand Down
5 changes: 3 additions & 2 deletions docker/judgehost/Dockerfile.chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:20.04
FROM ubuntu:24.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install \
RUN apt-add-repository ppa:pypy/ppa -y \
apt-get update && apt-get -y install \
ca-certificates default-jre-headless pypy3 locales \
&& rm -rf /var/lib/apt/lists/*

Expand Down
Loading