合并dev,添加管理员在前台可见比赛所有提交详情,修改措辞,修改提示形式,以便于提交列表筛选功能的使用

judge/Dockerfile

@@ -0,0 +1,19 @@
+FROM ubuntu:14.04
+MAINTAINER virusdefender<qduliyang@outlook.com>
+RUN mkdir /var/install/
+WORKDIR /var/install/
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update
+RUN apt-get -y install software-properties-common python-software-properties
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN apt-get update
+RUN apt-get -y install python gcc g++ rake pkg-config git make autoconf automake libtool python-pip python2.7-mysqldb
+RUN echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections
+RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections
+RUN apt-get install -y oracle-java7-installer
+RUN apt-get -y install libseccomp-dev
+RUN git clone https://github.com/quark-zju/lrun.git
+RUN cd lrun && make install
+RUN mkdir -p /var/judger/run/ && mkdir /var/judger/test_case/ && mkdir /var/judger/code/
+RUN chmod -R 777 /var/judger/run/
+WORKDIR /var/judger/code/

judge/judger_controller/settings.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+# 这个redis 是 celery 使用的，包括存储队列信息还有部分统计信息
 redis_config = {
     "host": "121.42.32.129",
     "port": 6379,
@@ -6,17 +7,21 @@ redis_config = {
 }
 
 
+# 判题的 docker 容器的配置参数
 docker_config = {
-    "image_name": " a7673b55d263",
+    "image_name": "3da0e526934e",
     "docker_path": "docker",
     "shell": True
 }
 
 
-test_case_dir = "/root/test_case/"
-source_code_dir = "/root/"
+# 测试用例的路径，是主机上的实际路径
+test_case_dir = "/var/mnt/source/test_case/"
+# 源代码路径，也就是 manage.py 所在的实际路径
+source_code_dir = "/var/mnt/source/OnlineJudge/"
 
 
+# 存储提交信息的数据库，是 celery 使用的，与 oj.settings/local_settings 等区分，那是 web 服务器访问的地址
 submission_db = {
     "host": "127.0.0.1",
     "port": 3306,