From ee748c0ec5f51951f08698dd5ce5654b15ae5995 Mon Sep 17 00:00:00 2001 From: Mikucat Date: Mon, 29 Jan 2024 12:29:49 +0800 Subject: [PATCH] feat: refactor & upgrade judge environment --- .gitmodules | 3 + Dockerfile | 145 +++++++++++++++++++++++++++++++++++-------- Judger | 1 + build/java_policy | 3 - server/entrypoint.sh | 15 +++-- 5 files changed, 134 insertions(+), 33 deletions(-) create mode 100644 .gitmodules create mode 160000 Judger delete mode 100644 build/java_policy diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..82e363a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Judger"] + path = Judger + url = git@github.com:QingdaoU/Judger.git diff --git a/Dockerfile b/Dockerfile index 2ccfaad..660f2bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,122 @@ -FROM ubuntu:18.04 +FROM debian:trixie-slim AS builder -COPY build/java_policy /etc -#RUN sed -E -i -e 's/(archive|ports).ubuntu.com/mirrors.aliyun.com/g' -e '/security.ubuntu.com/d' /etc/apt/sources.list ENV DEBIAN_FRONTEND=noninteractive -RUN buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev curl' && \ - apt-get update && apt-get install -y python python3 python-pkg-resources python3-pkg-resources $buildDeps && \ - add-apt-repository ppa:openjdk-r/ppa && add-apt-repository ppa:longsleep/golang-backports && \ - add-apt-repository ppa:ubuntu-toolchain-r/test && \ - add-apt-repository ppa:ondrej/php && \ - curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && \ - apt-get update && apt-get install -y golang-go openjdk-11-jdk php-cli nodejs gcc-9 g++-9 && \ - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 40 && \ - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 40 && \ - phpJitOption='opcache.enable=1\nopcache.enable_cli=1\nopcache.jit=1205\nopcache.jit_buffer_size=64M' && \ - echo $phpJitOption > /etc/php/8.0/cli/conf.d/10-opcache-jit.ini && \ - pip3 install -i https://mirrors.aliyun.com/pypi/simple/ -I --no-cache-dir psutil gunicorn flask requests idna && \ - cd /tmp && git clone -b newnew --depth 1 https://gitee.com/qduoj/Judger.git && cd Judger && \ - mkdir build && cd build && cmake .. && make && make install && cd ../bindings/Python && python3 setup.py install && \ - apt-get purge -y --auto-remove $buildDeps && \ - apt-get clean && rm -rf /var/lib/apt/lists/* && \ - mkdir -p /code && \ - useradd -u 12001 compiler && useradd -u 12002 code && useradd -u 12003 spj && usermod -a -G code spj -HEALTHCHECK --interval=5s --retries=3 CMD python3 /code/service.py -ADD server /code -WORKDIR /code -RUN gcc -shared -fPIC -o unbuffer.so unbuffer.c +WORKDIR /app + +RUN --mount=type=cache,target=/var/cache/apt,id=apt-cahce-1-$TARGETARCH$TARGETVARIANT-builder,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,id=apt-cahce-2-$TARGETARCH$TARGETVARIANT-builder,sharing=locked \ + < /etc/apt/apt.conf.d/keep-cache +echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/no-recommends +echo 'APT::AutoRemove::RecommendsImportant "0";' >> /etc/apt/apt.conf.d/no-recommends +apt-get update +apt-get install -y libtool make cmake libseccomp-dev gcc python3 python3-venv +EOS + +COPY Judger/ /app/ +RUN < /etc/apt/apt.conf.d/keep-cache +echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/no-recommends +echo 'APT::AutoRemove::RecommendsImportant "0";' >> /etc/apt/apt.conf.d/no-recommends +needed="python3.12-minimal \ + python3.12-venv \ + libpython3.12-stdlib \ + libpython3.12-dev \ + golang-1.22-go \ + temurin-21-jdk \ + gcc-13 \ + g++-13 \ + nodejs \ + strace" +savedAptMark="$(apt-mark showmanual) $needed" +apt-get update +apt-get install -y ca-certificates curl gnupg +curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg +cat > /etc/apt/sources.list.d/adoptium.sources < /etc/apt/sources.list.d/nodesource.sources < /dev/null +apt-mark manual $savedAptMark +apt-get purge -y --auto-remove +EOS + +COPY --from=builder --chmod=755 --link /app/output/libjudger.so /usr/lib/judger/libjudger.so +COPY --from=builder /app/bindings/Python/dist/ /app/ +RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cahce-$TARGETARCH$TARGETVARIANT-final \ + <