Skip to content

Commit

Permalink
Merge branch 'master' into openjdk-22
Browse files Browse the repository at this point in the history
  • Loading branch information
Xyene authored Jun 2, 2024
2 parents 7e66092 + 05950ea commit 59388f1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tier1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN echo deb http://deb.debian.org/debian/ bullseye main > /etc/apt/sources.list
python2 fp-compiler libxtst6 tini ca-certificates-java openjdk-8-jdk-headless openjdk-8-jre-headless \
$([ "$(arch)" = aarch64 ] && echo binutils-arm-linux-gnueabihf) && \
mkdir -p /etc/perl && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \
useradd -m judge

ENTRYPOINT ["/usr/bin/tini", "/code/run"]
6 changes: 1 addition & 5 deletions tier2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ RUN apt-get update && \
jq apt-transport-https dirmngr gnupg ca-certificates xz-utils \
$([ "$(arch)" = x86_64 ] && echo libc6-dev-i386) \
openjdk-22-jdk-headless clang llvm ghc golang racket ruby scala nasm chicken-bin && \
ls /usr/lib/jvm && \
ls /usr/lib/jvm/java-22* && \
( export OPAMYES=1 OPAMJOBS=$(($(nproc) + 2)); \
apt-get install -y --no-install-recommends make m4 patch unzip libgmp-dev && \
bash -c 'echo | sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --no-backup' && \
Expand Down Expand Up @@ -54,8 +52,6 @@ RUN apt-get update && \
rm -rf roslyn/ && \
apt-get install -y --no-install-recommends mono-devel ./mono-roslyn_no_conflict.deb mono-vbnc fsharp v8dmoj && \
rm -f *.deb) && \
ls /usr/lib/jvm && \
ls /usr/lib/jvm/java-22* && \
rm -rf /var/lib/apt/lists/*
apt-get clean && rm -rf /var/lib/apt/lists/*

ENV PATH="/opt/dlang/linux/bin64:/home/judge/.cargo/bin:/opt/pypy2/bin:/opt/pypy3/bin:/opt/dart-sdk/bin:${PATH}"
3 changes: 2 additions & 1 deletion tier3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ RUN (cd /opt && \
jq -r '[.[] | select(.prerelease | not) | .assets | flatten | .[] | select((.name | startswith("lean-")) and (.name | endswith("-linux.zip"))) | .browser_download_url][0]')" && \
unzip lean.zip && \
mv lean-*/* /opt/lean && \
rm -rf lean.zip lean-*; fi
rm -rf lean.zip lean-*; fi && \
apt-get clean && rm -rf /var/lib/apt/lists/*

ENV PATH "/opt/tprolog:/opt/groovy/bin:/opt/kotlin/bin:${PATH}:/opt/swift/usr/bin:/opt/zig:/opt/lean/bin"

0 comments on commit 59388f1

Please sign in to comment.