diff --git a/build/Dockerfile b/build/Dockerfile index 1e25353..91cbe45 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,16 +1,16 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 ENV DEBIAN_FRONTEND noninteractive -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/ RUN apt-get update -RUN apt-get -y install software-properties-common python-software-properties python python-dev gcc g++ git libtool python-pip libseccomp-dev cmake openjdk-7-jdk +RUN apt-get -y install software-properties-common python-software-properties python python-dev gcc g++ git libtool python-pip libseccomp-dev cmake +RUN add-apt-repository ppa:openjdk-r/ppa +RUN apt-get update +RUN apt-get install -y openjdk-7-jdk RUN cd /tmp && git clone https://github.com/QingdaoU/Judger && cd Judger && git checkout newnew && mkdir build && cd build && cmake .. && make && make install && cd ../bindings/Python && python setup.py install -RUN pip install psutil gunicorn web.py requests RUN mkdir -p /judger_run /test_case /log /code COPY java_policy /etc -RUN pip install futures psutil gunicorn web.py +RUN pip install futures psutil gunicorn web.py requests RUN useradd -r compiler HEALTHCHECK --interval=5s --retries=3 CMD python /code/service.py WORKDIR /code EXPOSE 8080 -CMD /bin/bash /code/run.sh +CMD /bin/bash /code/run.sh \ No newline at end of file diff --git a/build/sources.list b/build/sources.list deleted file mode 100644 index 3f18a0f..0000000 --- a/build/sources.list +++ /dev/null @@ -1,10 +0,0 @@ -deb http://mirrors.aliyun.com/ubuntu/ trusty main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ trusty-security main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ trusty-updates main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ trusty-proposed main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ trusty-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ trusty main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ trusty-security main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ trusty-updates main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ trusty-proposed main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ trusty-backports main restricted universe multiverse \ No newline at end of file