From 0f28c0e2ce3f0a65ce0c5d93ae7ca71bcef3080d Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 17 Sep 2015 15:21:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20superivisord=20?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {judge => dockerfiles/judger}/Dockerfile | 0 {judge => dockerfiles/judger}/sources.list | 0 .../oj_web_server/Dockerfile | 3 ++- dockerfiles/oj_web_server/gunicorn.conf | 16 ++++++++++++ dockerfiles/oj_web_server/mq.conf | 16 ++++++++++++ dockerfiles/oj_web_server/supervisord.conf | 26 +++++++++++++++++++ tools/celeryd.conf | 15 +++++++++++ tools/supervisord.conf | 26 +++++++++++++++++++ 8 files changed, 101 insertions(+), 1 deletion(-) rename {judge => dockerfiles/judger}/Dockerfile (100%) rename {judge => dockerfiles/judger}/sources.list (100%) rename Dockerfile => dockerfiles/oj_web_server/Dockerfile (85%) create mode 100644 dockerfiles/oj_web_server/gunicorn.conf create mode 100644 dockerfiles/oj_web_server/mq.conf create mode 100644 dockerfiles/oj_web_server/supervisord.conf create mode 100644 tools/celeryd.conf create mode 100644 tools/supervisord.conf diff --git a/judge/Dockerfile b/dockerfiles/judger/Dockerfile similarity index 100% rename from judge/Dockerfile rename to dockerfiles/judger/Dockerfile diff --git a/judge/sources.list b/dockerfiles/judger/sources.list similarity index 100% rename from judge/sources.list rename to dockerfiles/judger/sources.list diff --git a/Dockerfile b/dockerfiles/oj_web_server/Dockerfile similarity index 85% rename from Dockerfile rename to dockerfiles/oj_web_server/Dockerfile index 113ed588..f566796b 100644 --- a/Dockerfile +++ b/dockerfiles/oj_web_server/Dockerfile @@ -4,4 +4,5 @@ RUN mkdir -p /code/log /code/test_case /code/upload WORKDIR /code ADD requirements.txt /code/ RUN pip install -r requirements.txt -EXPOSE 8010 \ No newline at end of file +EXPOSE 8010 +CMD superivisord \ No newline at end of file diff --git a/dockerfiles/oj_web_server/gunicorn.conf b/dockerfiles/oj_web_server/gunicorn.conf new file mode 100644 index 00000000..1d784cd6 --- /dev/null +++ b/dockerfiles/oj_web_server/gunicorn.conf @@ -0,0 +1,16 @@ +[program:gunicorn] + +command=gunicorn oj.wsgi:application -b 0.0.0.0:8080 --reload + +directory=/root/qduoj/ +user=root +numprocs=1 +stdout_logfile=/root/log/gunicorn.log +stderr_logfile=/root/log/gunicorn.log +autostart=true +autorestart=true +startsecs=5 + +stopwaitsecs = 6 + +killasgroup=true \ No newline at end of file diff --git a/dockerfiles/oj_web_server/mq.conf b/dockerfiles/oj_web_server/mq.conf new file mode 100644 index 00000000..0460cba8 --- /dev/null +++ b/dockerfiles/oj_web_server/mq.conf @@ -0,0 +1,16 @@ +[program:mq] + +command=python manage.py runscript mq + +directory=/root/qduoj/ +user=root +numprocs=1 +stdout_logfile=/root/log/mq.log +stderr_logfile=/root/log/mq.log +autostart=true +autorestart=true +startsecs=5 + +stopwaitsecs = 6 + +killasgroup=true \ No newline at end of file diff --git a/dockerfiles/oj_web_server/supervisord.conf b/dockerfiles/oj_web_server/supervisord.conf new file mode 100644 index 00000000..1494d7cd --- /dev/null +++ b/dockerfiles/oj_web_server/supervisord.conf @@ -0,0 +1,26 @@ +[unix_http_server] +file=/tmp/supervisor.sock ; path to your socket file + +[supervisord] +logfile=/root/log/supervisord.log ; supervisord log file +logfile_maxbytes=50MB ; maximum size of logfile before rotation +logfile_backups=10 ; number of backed up logfiles +loglevel=info ; info, debug, warn, trace +pidfile=/root/log/supervisord.pid ; pidfile location +nodaemon=false ; run supervisord as a daemon +minfds=1024 ; number of startup file descriptors +minprocs=200 ; number of process descriptors +user=root ; default user +childlogdir=/root/log/ ; where child log files will live + + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///tmp/supervisor.sock ; use unix:// schem for a unix sockets. + + +[include] + +files=*.conf \ No newline at end of file diff --git a/tools/celeryd.conf b/tools/celeryd.conf new file mode 100644 index 00000000..60e3fc21 --- /dev/null +++ b/tools/celeryd.conf @@ -0,0 +1,15 @@ +[program:celery] +command=celery worker -A judge.judger_controller --loglevel=DEBUG + +directory=/root/qduoj/ +user=root +numprocs=1 +stdout_logfile=/root/log/celery_worker.log +stderr_logfile=/root/log/celery_worker.log +autostart=true +autorestart=true +startsecs=5 + +stopwaitsecs = 6 + +killasgroup=true diff --git a/tools/supervisord.conf b/tools/supervisord.conf new file mode 100644 index 00000000..1494d7cd --- /dev/null +++ b/tools/supervisord.conf @@ -0,0 +1,26 @@ +[unix_http_server] +file=/tmp/supervisor.sock ; path to your socket file + +[supervisord] +logfile=/root/log/supervisord.log ; supervisord log file +logfile_maxbytes=50MB ; maximum size of logfile before rotation +logfile_backups=10 ; number of backed up logfiles +loglevel=info ; info, debug, warn, trace +pidfile=/root/log/supervisord.pid ; pidfile location +nodaemon=false ; run supervisord as a daemon +minfds=1024 ; number of startup file descriptors +minprocs=200 ; number of process descriptors +user=root ; default user +childlogdir=/root/log/ ; where child log files will live + + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///tmp/supervisor.sock ; use unix:// schem for a unix sockets. + + +[include] + +files=*.conf \ No newline at end of file From 7f72e3f1b0e3136eebd5edcb1b007d357476a972 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 17 Sep 2015 15:27:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?docker=20file=20=E4=B8=AD=20ADD=20=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=BD=BF=E7=94=A8=E4=B8=8A=E7=BA=A7=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt => dockerfiles/oj_web_server/requirements.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename requirements.txt => dockerfiles/oj_web_server/requirements.txt (100%) diff --git a/requirements.txt b/dockerfiles/oj_web_server/requirements.txt similarity index 100% rename from requirements.txt rename to dockerfiles/oj_web_server/requirements.txt From beb060bf632d17434460322ca771f3bf55bfc1cc Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 17 Sep 2015 15:41:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=A5=E5=BF=97=E8=B7=AF=E5=BE=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dockerfiles/oj_web_server/gunicorn.conf | 6 +++--- dockerfiles/oj_web_server/mq.conf | 6 +++--- dockerfiles/oj_web_server/supervisord.conf | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dockerfiles/oj_web_server/gunicorn.conf b/dockerfiles/oj_web_server/gunicorn.conf index 1d784cd6..60dcce12 100644 --- a/dockerfiles/oj_web_server/gunicorn.conf +++ b/dockerfiles/oj_web_server/gunicorn.conf @@ -2,11 +2,11 @@ command=gunicorn oj.wsgi:application -b 0.0.0.0:8080 --reload -directory=/root/qduoj/ +directory=/code/qduoj/ user=root numprocs=1 -stdout_logfile=/root/log/gunicorn.log -stderr_logfile=/root/log/gunicorn.log +stdout_logfile=/code/log/gunicorn.log +stderr_logfile=/code/log/gunicorn.log autostart=true autorestart=true startsecs=5 diff --git a/dockerfiles/oj_web_server/mq.conf b/dockerfiles/oj_web_server/mq.conf index 0460cba8..9dbce3e4 100644 --- a/dockerfiles/oj_web_server/mq.conf +++ b/dockerfiles/oj_web_server/mq.conf @@ -2,11 +2,11 @@ command=python manage.py runscript mq -directory=/root/qduoj/ +directory=/code/qduoj/ user=root numprocs=1 -stdout_logfile=/root/log/mq.log -stderr_logfile=/root/log/mq.log +stdout_logfile=/code/log/mq.log +stderr_logfile=/code/log/mq.log autostart=true autorestart=true startsecs=5 diff --git a/dockerfiles/oj_web_server/supervisord.conf b/dockerfiles/oj_web_server/supervisord.conf index 1494d7cd..12b36bef 100644 --- a/dockerfiles/oj_web_server/supervisord.conf +++ b/dockerfiles/oj_web_server/supervisord.conf @@ -2,16 +2,16 @@ file=/tmp/supervisor.sock ; path to your socket file [supervisord] -logfile=/root/log/supervisord.log ; supervisord log file +logfile=/code/log/supervisord.log ; supervisord log file logfile_maxbytes=50MB ; maximum size of logfile before rotation logfile_backups=10 ; number of backed up logfiles loglevel=info ; info, debug, warn, trace -pidfile=/root/log/supervisord.pid ; pidfile location +pidfile=/code/log/supervisord.pid ; pidfile location nodaemon=false ; run supervisord as a daemon minfds=1024 ; number of startup file descriptors minprocs=200 ; number of process descriptors user=root ; default user -childlogdir=/root/log/ ; where child log files will live +childlogdir=/code/log/ ; where child log files will live [rpcinterface:supervisor] @@ -23,4 +23,4 @@ serverurl=unix:///tmp/supervisor.sock ; use unix:// schem for a unix sockets. [include] -files=*.conf \ No newline at end of file +files=gunicorn.conf mq.conf \ No newline at end of file From b163664e9f83609ed4b972175a36cd46c9b7c2e9 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 17 Sep 2015 15:42:38 +0800 Subject: [PATCH 4/6] fix typo --- dockerfiles/oj_web_server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/oj_web_server/Dockerfile b/dockerfiles/oj_web_server/Dockerfile index f566796b..07a73e9f 100644 --- a/dockerfiles/oj_web_server/Dockerfile +++ b/dockerfiles/oj_web_server/Dockerfile @@ -5,4 +5,4 @@ WORKDIR /code ADD requirements.txt /code/ RUN pip install -r requirements.txt EXPOSE 8010 -CMD superivisord \ No newline at end of file +CMD supervisord \ No newline at end of file From 07f87acae4bc89957213e574bcb361c5691b60a6 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 17 Sep 2015 16:07:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A6=82=E6=9E=9C=20nodaemon=3Dtrue=20dock?= =?UTF-8?q?er=20=E4=BC=9A=E8=AE=A4=E4=B8=BA=E6=95=B4=E4=B8=AA=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=B7=B2=E7=BB=8F=E7=BB=93=E6=9D=9F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dockerfiles/oj_web_server/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/oj_web_server/supervisord.conf b/dockerfiles/oj_web_server/supervisord.conf index 12b36bef..420b65f4 100644 --- a/dockerfiles/oj_web_server/supervisord.conf +++ b/dockerfiles/oj_web_server/supervisord.conf @@ -7,7 +7,7 @@ logfile_maxbytes=50MB ; maximum size of logfile before rotation logfile_backups=10 ; number of backed up logfiles loglevel=info ; info, debug, warn, trace pidfile=/code/log/supervisord.pid ; pidfile location -nodaemon=false ; run supervisord as a daemon +nodaemon=true ; run supervisord as a daemon minfds=1024 ; number of startup file descriptors minprocs=200 ; number of process descriptors user=root ; default user From 2d1a95aa441f4d8a7680345ef17c7e9518ef8251 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Thu, 17 Sep 2015 16:11:14 +0800 Subject: [PATCH 6/6] fix typo --- dockerfiles/oj_web_server/gunicorn.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/oj_web_server/gunicorn.conf b/dockerfiles/oj_web_server/gunicorn.conf index 60dcce12..3ad64967 100644 --- a/dockerfiles/oj_web_server/gunicorn.conf +++ b/dockerfiles/oj_web_server/gunicorn.conf @@ -2,7 +2,7 @@ command=gunicorn oj.wsgi:application -b 0.0.0.0:8080 --reload -directory=/code/qduoj/ +directory=/code/ user=root numprocs=1 stdout_logfile=/code/log/gunicorn.log