refactor(manage): not use redis in docker

Author: zdszero

README.md

@@ -9,7 +9,11 @@ source venv/bin/activate
 pip3 install -r requirements.txt
 ```
 
-- __install docker__
+- __install required programs__
+
+```
+sudo apt install redis supervisor nginx
+```
 
 ## run
 

deploy/supervisord.conf

@@ -8,14 +8,22 @@ nodaemon=true
 childlogdir=%(ENV_WORKDIR)s/data/log
 
 [inet_http_server]
-port=127.0.0.1:9005
+port=0.0.0.0:9005
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
 serverurl=http://0.0.0.0:9005
 
+[program:redis]
+command=redis-server --port 6380
+directory=%(ENV_WORKDIR)s
+stdout_logfile=%(ENV_WORKDIR)s/data/log/redis.log
+stderr_logfile=%(ENV_WORKDIR)s/data/log/redis.log
+autostart=true
+autorestart=true
+
 [program:gunicorn]
 command=gunicorn onl.wsgi --bind 0.0.0.0:7890 --workers %(ENV_MAX_WORKER_NUM)s --threads 4 --max-requests-jitter 10000 --max-requests 1000000 --keep-alive 32 --access-logfile - --error-logfile -
 directory=%(ENV_WORKDIR)s

manage

@@ -44,20 +44,6 @@ function run_onl {
   workdir=$(pwd)
   process_num=$(($(nproc) * 2 - 1))
 
-  # run redis
-  if ! command docker container ls | grep redis > /dev/null; then
-    echo "running redis in docker ..."
-    if ! command docker ps -a | grep redis > /dev/null; then
-      docker run -it -d -p 6380:6379 --name oj-redis-dev redis:4.0-alpine > /dev/null
-    else
-      container_id=$(docker ps -a | grep redis | awk '{print $1}')
-      docker container start $container_id > /dev/null
-    fi
-    [[ $? -ne 0 ]] && echo "Error: fail to run redis docker"
-  else
-    echo "redis is already running"
-  fi
-
   # run onl
   if ! command pgrep -f "$supervisor_cmd" > /dev/null; then
     echo "running onl controller ..."

onl/settings.py

@@ -37,7 +37,7 @@
     # }
     REDIS_CONF = {
         "host": get_env("REDIS_HOST", "oj-redis"),
-        "port": get_env("REDIS_PORT", "6379")
+        "port": get_env("REDIS_PORT", "6380")
     }
     DEBUG = False
     ALLOWED_HOSTS = ['*']