From 2d00d855f2e588bd9f6de83e280505dc3668f8c0 Mon Sep 17 00:00:00 2001 From: Harry-zklcdc <1269158832@qq.com> Date: Fri, 17 Jul 2020 09:53:22 +0800 Subject: [PATCH] [Fix] FileOI problem --- Dockerfile | 2 +- Dockerfile-cn | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe30c18..0a05e57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN buildDeps='software-properties-common git libtool cmake python-dev python3-p rm /usr/bin/gcc /usr/bin/g++ && ln -s /usr/bin/gcc-9 /usr/bin/gcc && ln -s /usr/bin/g++-9 /usr/bin/g++ && \ add-apt-repository ppa:openjdk-r/ppa && add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go openjdk-8-jdk && \ pip3 install -I --no-cache-dir psutil gunicorn flask requests idna && \ - cd /tmp && git clone -b newnew --depth 1 https://github.com/QingdaoU/Judger && cd Judger && \ + cd /tmp && git clone -b newnew --depth 1 https://github.com/Harry-zklcdc/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/* && \ diff --git a/Dockerfile-cn b/Dockerfile-cn index 0b7a4b5..9d01cc6 100644 --- a/Dockerfile-cn +++ b/Dockerfile-cn @@ -1,17 +1,17 @@ FROM ubuntu:18.04 COPY build/java_policy /etc +COPY sources.list /etc/apt/sources.list -RUN apt-get update && apt-get install -y wget && wget https://raw.githubusercontent.com/Harry-zklcdc/JudgeServer/master/sources.list && mv sources.list /etc/apt/sources.list && \ - buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev' && \ - apt-get update && apt-get install -y python python-pkg-resources python3-pkg-resources $buildDeps && \ +RUN buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev' && \ + apt-get update && apt-get install -y python python3 python-pkg-resources python3-pkg-resources $buildDeps && \ add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-9 g++-9 && \ rm /usr/bin/gcc /usr/bin/g++ && ln -s /usr/bin/gcc-9 /usr/bin/gcc && ln -s /usr/bin/g++-9 /usr/bin/g++ && \ add-apt-repository ppa:openjdk-r/ppa && add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go openjdk-8-jdk && \ - pip3 install -I --no-cache-dir psutil gunicorn flask requests idna -i https://mirrors.aliyun.com/pypi/simple/ && \ + pip3 install -I --no-cache-dir psutil gunicorn flask requests idna && \ cd /tmp && git clone -b newnew --depth 1 https://github.com/QingdaoU/Judger && cd Judger && \ mkdir build && cd build && cmake .. && make && make install && cd ../bindings/Python && python3 setup.py install && \ - apt-get purge -y --auto-remove wget $buildDeps && \ + 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