From 97737c3ef167c6e4c43fa435a2ab764da3d9bfe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Tue, 2 Jan 2024 23:17:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0docker=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=80=E9=94=AE=E5=90=AF=E5=8A=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/settings.py | 2 +- backend/conf/env.example.py | 2 +- docker_env/django/Dockerfile | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/application/settings.py b/backend/application/settings.py index 7f8e7d5..70446c1 100644 --- a/backend/application/settings.py +++ b/backend/application/settings.py @@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = [] # ********** 一键导入插件配置开始 ********** # 例如: # from dvadmin_upgrade_center.settings import * # 升级中心 -# from dvadmin_celery.settings import * # celery 异步任务 +from dvadmin_celery.settings import * # celery 异步任务 # from dvadmin_third.settings import * # 第三方用户管理 # from dvadmin_ak_sk.settings import * # 秘钥管理管理 # from dvadmin_tenants.settings import * # 租户管理 diff --git a/backend/conf/env.example.py b/backend/conf/env.example.py index f20a698..bf015db 100644 --- a/backend/conf/env.example.py +++ b/backend/conf/env.example.py @@ -15,7 +15,7 @@ DATABASE_ENGINE = "django.db.backends.mysql" DATABASE_NAME = 'django-vue3-admin' # mysql 时使用 # 数据库地址 改为自己数据库地址 -DATABASE_HOST = "127.0.0.1" +DATABASE_HOST = '127.0.0.1' # # 数据库端口 DATABASE_PORT = 3306 # # 数据库用户名 diff --git a/docker_env/django/Dockerfile b/docker_env/django/Dockerfile index 3f8c93c..7acd383 100644 --- a/docker_env/django/Dockerfile +++ b/docker_env/django/Dockerfile @@ -1,6 +1,9 @@ FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest WORKDIR /backend COPY ./backend/ . +RUN ls ./conf/ RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }' +RUN sed -i "s|DATABASE_HOST = "127.0.0.1"|DATABASE_HOST = '177.10.0.1'|g" ./conf/env.py +RUN sed -i "s|REDIS_HOST = '127.0.0.1'|REDIS_HOST = '177.10.0.1'|g" ./conf/env.py RUN python3 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple/ -r requirements.txt CMD ["/backend/docker_start.sh"]