!42 基础Docker镜像python:3.7无法安装python3.7-dev

Merge pull request !42 from SamsongDY/master

docker_env/celery/Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.7
+FROM python:3.8
 # ENV PYTHONUNBUFFERED 1
 RUN sed -i s/deb.debian.org/mirrors.163.com/g /etc/apt/sources.list
 RUN cat /etc/apt/sources.list
 RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y build-essential
-RUN apt-get install -y python3.7-dev libpq-dev libopencv-dev python-opencv
+RUN apt-get install -y python3.8-dev libpq-dev libopencv-dev
 RUN apt-get install -y redis-tools
 RUN mkdir /dvadmin-backend
 WORKDIR /dvadmin-backend

docker_env/django/Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.7
+FROM python:3.8
 # ENV PYTHONUNBUFFERED 1
 RUN sed -i s/deb.debian.org/mirrors.163.com/g /etc/apt/sources.list
 RUN cat /etc/apt/sources.list
 RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y build-essential
-RUN apt-get install -y python3.7-dev libpq-dev libopencv-dev python-opencv
+RUN apt-get install -y python3.8-dev libpq-dev libopencv-dev
 RUN apt-get install -y redis-tools
 RUN mkdir /dvadmin-backend
 WORKDIR /dvadmin-backend

dvadmin-backend/.gitignore

@@ -89,7 +89,9 @@ ENV/
 *.db
 .DS_Store
 __pycache__
+migrations/
 !migrations/__init__.py
 *.pyc
+conf/
 !conf/env.example.py
 db.sqlite3

dvadmin-backend/apps/vadmin/monitor/tasks.py

@@ -84,6 +84,7 @@ def clean_surplus_monitor_info():
     :return:
     """
     config_settings_obj = ConfigSettings.objects.filter(configKey='sys.monitor.info.save_days').first()
-    Monitor.objects.filter(
-        update_datetime__lt=datetime.timedelta(days=int(config_settings_obj.configValue or 30))).delete()
+    today = datetime.datetime.now().date()
+    clean_day_before = today - datetime.timedelta(days=int(config_settings_obj.configValue or 30))
+    Monitor.objects.filter(update_datetime__lt=clean_day_before).delete()
     logger.info(f"成功清空{config_settings_obj.configValue}天前数据")

dvadmin-backend/requirements.txt

@@ -31,3 +31,5 @@ drf-yasg==1.20.0
 daphne==3.0.2
 channels==3.0.3
 channels-redis==3.2.0
+opencv-python==4.5.3.56
+