From b6605788880b60f597d9909ac7a7a17c57d7812a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sun, 7 Mar 2021 11:00:30 +0800
Subject: [PATCH] =?UTF-8?q?docker=20=E9=83=A8=E7=BD=B2=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                      | 51 +++++++++++++------------
 dvadmin-backend/application/settings.py |  6 +--
 dvadmin-backend/conf/env.example.py     |  4 +-
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 35f8e1b..134fe4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       - "3307:3306"
     environment:
       MYSQL_ROOT_PASSWORD: "q1w2e3r4T%Y^U&MYSQL"
-      MYSQL_DATABASE: "dvadmin"
+      MYSQL_DATABASE: "django-vue-admin"
       TZ: Asia/Shanghai
     command:
       --wait_timeout=31536000
@@ -61,6 +61,9 @@ services:
     depends_on:
       - dvadmin-mysql
       - dvadmin-redis
+    environment:
+      - REDIS_HOST=dvadmin-redis
+      - DATABASE_HOST=dvadmin-mysql
     volumes:
       - ./dvadmin-backend:/dvadmin-backend
       - ./logs/log:/var/log
@@ -97,29 +100,29 @@ services:
 #      - dvadmin_net
 
 
-#  dvadmin-nginx:
-#    image: nginx:latest
-#    container_name: docker-nginx
-#    # build: ./docker_env/nginx
-#    restart: always
-#    ports:
-#      - "80:80"
-#      - "443:443"
-#    expose:
-#      - "80"
-#      - "443"
-#    volumes:
-#      - ./docker_env/nginx/nginx.conf:/etc/nginx/nginx.conf
-#      - ./docker_env/nginx/sites-enabled:/etc/nginx/sites-enabled
-#      - ./docker_env/nginx/keys:/nginx/keys
-#      - ./dvadmin-backend:/dvadmin-backend
-#      - ./dvadmin-doc:/dvadmin-doc
-#      - ./dvadmin-ui:/dvadmin-ui
-#      - ./logs/nginx:/var/log/nginx
-#    depends_on:
-#      - dvadmin-django
-#    networks:
-#      - dvadmin_net
+  dvadmin-nginx:
+    image: nginx:latest
+    container_name: docker-nginx
+    # build: ./docker_env/nginx
+    restart: always
+    ports:
+      - "80:80"
+      - "443:443"
+    expose:
+      - "80"
+      - "443"
+    volumes:
+      - ./docker_env/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./docker_env/nginx/sites-enabled:/etc/nginx/sites-enabled
+      - ./docker_env/nginx/keys:/nginx/keys
+      - ./dvadmin-backend:/dvadmin-backend
+      - ./dvadmin-doc:/dvadmin-doc
+      - ./dvadmin-ui:/dvadmin-ui
+      - ./logs/nginx:/var/log/nginx
+    depends_on:
+      - dvadmin-django
+    networks:
+      - dvadmin_net
 
 networks:
   dvadmin_net:
diff --git a/dvadmin-backend/application/settings.py b/dvadmin-backend/application/settings.py
index 5dd2189..66a4712 100644
--- a/dvadmin-backend/application/settings.py
+++ b/dvadmin-backend/application/settings.py
@@ -210,7 +210,7 @@ if DATABASE_TYPE == "MYSQL":
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.mysql",
-            "HOST": DATABASE_HOST,
+            "HOST": os.getenv('DATABASE_HOST') or DATABASE_HOST,
             "PORT": DATABASE_PORT,
             "USER": DATABASE_USER,
             "PASSWORD": DATABASE_PASSWORD,
@@ -226,9 +226,9 @@ else:
         }
     }
 
-connect(MONGO_DATABASE_NAME, host=MONGO_HOST, port=MONGO_PORT, serverSelectionTimeoutMS=1000, connect=False)
+connect(MONGO_DATABASE_NAME, host=os.getenv('MONGO_HOST') or MONGO_HOST, port=MONGO_PORT, serverSelectionTimeoutMS=1000, connect=False)
 # redis 缓存
-REDIS_URL = f'redis://:{REDIS_PASSWORD if REDIS_PASSWORD else ""}@{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}'
+REDIS_URL = f'redis://:{REDIS_PASSWORD if REDIS_PASSWORD else ""}@{os.getenv("REDIS_HOST") or REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}'
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
diff --git a/dvadmin-backend/conf/env.example.py b/dvadmin-backend/conf/env.example.py
index f88c0f5..95a5da9 100644
--- a/dvadmin-backend/conf/env.example.py
+++ b/dvadmin-backend/conf/env.example.py
@@ -11,7 +11,7 @@ DATABASE_PORT = 3306
 # 数据库用户名
 DATABASE_USER = "root"
 # 数据库密码
-DATABASE_PASSWORD = "123456"
+DATABASE_PASSWORD = "q1w2e3r4T%Y^U&MYSQL"
 # 数据库名
 DATABASE_NAME = "django-vue-admin"
 
@@ -28,7 +28,7 @@ MONGO_PORT = 27017
 REDIS_DB = 1
 REDIS_HOST = '127.0.0.1'
 REDIS_PORT = 6379
-REDIS_PASSWORD = 'q1w2e3r4T%Y^U&'
+REDIS_PASSWORD = ''
 
 # ================================================= #
 # ************** 默认配置  ************** #