配置变化: docker配置优化

2023-01-25 10:06:56 +08:00
parent 4804df5079
commit 3cf64e74e8
10 changed files with 112 additions and 114 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
-  dvadmin-web:
-    container_name: dvadmin-web
+  dvadmin3-web:
+    container_name: dvadmin3-web
    ports:
      - "8080:8080"
    build:
@@ -17,18 +17,18 @@ services:
      network:
        ipv4_address: 177.10.0.11

-  dvadmin-django:
+  dvadmin3-django:
    build:
      context: .
      dockerfile: ./docker_env/django/Dockerfile
-    container_name: dvadmin-django
+    container_name: dvadmin3-django
    working_dir: /backend
 # 打开mysql 时，打开此选项
 #    depends_on:
-#      - dvadmin-mysql
+#      - dvadmin3-mysql
    environment:
      PYTHONUNBUFFERED: 1
-      DATABASE_HOST: dvadmin-mysql
+      DATABASE_HOST: dvadmin3-mysql
      TZ: Asia/Shanghai
    volumes:
      - ./backend:/backend
@@ -42,9 +42,9 @@ services:
      network:
        ipv4_address: 177.10.0.12

-#  dvadmin-mysql:
+#  dvadmin3-mysql:
 #    image: mysql:5.7
-#    container_name: dvadmin-mysql
+#    container_name: dvadmin3-mysql
 #    #使用该参数，container内的root拥有真正的root权限，否则，container内的root只是外部的一个普通用户权限
 #    #设置为true，不然数据卷可能挂载不了，启动不起
 ##    privileged: true
@@ -53,7 +53,7 @@ services:
 #      - "3306:3306"
 #    environment:
 #      MYSQL_ROOT_PASSWORD: "123456"
-#      MYSQL_DATABASE: "dvadmin_pro"
+#      MYSQL_DATABASE: "dvadmin3_pro"
 #      TZ: Asia/Shanghai
 #    command:
 #      --wait_timeout=31536000
@@ -70,18 +70,18 @@ services:


 # 如果使用celery 插件，请自行打开此注释
-#  dvadmin-celery:
+#  dvadmin3-celery:
 #    build:
 #      context: .
 #      dockerfile: ./docker_env/celery/Dockerfile
 #    # image: django:2.2
-#    container_name: dvadmin-celery
+#    container_name: dvadmin3-celery
 #    working_dir: /backend
 #    depends_on:
-#      - dvadmin-mysql
+#      - dvadmin3-mysql
 #    environment:
 #      PYTHONUNBUFFERED: 1
-#      DATABASE_HOST: dvadmin-mysql
+#      DATABASE_HOST: dvadmin3-mysql
 #      TZ: Asia/Shanghai
 #    volumes:
 #      - ./backend:/backend
@@ -92,9 +92,9 @@ services:
 #        ipv4_address: 177.10.0.14


-# dvadmin-redis:
+# dvadmin3-redis:
 #   image: redis:6.2.6-alpine # 指定服务镜像，最好是与之前下载的redis配置文件保持一致
-#   container_name: dvadmin-redis # 容器名称
+#   container_name: dvadmin3-redis # 容器名称
 #   restart: on-failure # 重启方式
 #   environment:
 #     - TZ=Asia/Shanghai # 设置时区
--- a/docker_env/README.md
+++ b/docker_env/README.md
@@ -4,9 +4,9 @@

 ~~~sh
 # 编译打包到本地
-docker build -f ./docker_env/web/DockerfileBuild -t registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/node14-base-web:latest .
+docker build -f ./docker_env/web/DockerfileBuild -t registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:latest .
 # 上传到阿里云仓库
-docker push registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/node14-base-web:latest
+docker push registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:latest

 ~~~

@@ -14,9 +14,9 @@ docker push registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/node14-base-web:lat

 ~~~sh
 # 编译打包到本地
-docker build -f ./docker_env/django/DockerfileBuild -t registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/python310-base-backend:latest .
+docker build -f ./docker_env/django/DockerfileBuild -t registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest .
 # 上传到阿里云仓库
-docker push registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/python310-base-backend:latest
+docker push registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest
 ~~~

 ### 运行前端
--- a/docker_env/celery/Dockerfile
+++ b/docker_env/celery/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/python38-base-backend:latest
+FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest
 WORKDIR /backend
 COPY ./backend/ .
 RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py   ./conf/env.py "; print "n" |cmd; }'
--- a/docker_env/django/Dockerfile
+++ b/docker_env/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/python310-base-backend:latest
+FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-backend:latest
 WORKDIR /backend
 COPY ./backend/ .
 RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py   ./conf/env.py "; print "n" |cmd; }'
--- a/docker_env/django/DockerfileBuild
+++ b/docker_env/django/DockerfileBuild
@@ -3,6 +3,4 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 RUN apk update && apk add bash bash-doc bash-completion git freetds-dev jpeg-dev linux-headers mysql-client mariadb-dev build-base libffi-dev openssl-dev zlib-dev bzip2-dev pcre-dev ncurses-dev readline-dev tk-dev postgresql-dev
 WORKDIR /backend
 COPY ./backend/requirements.txt .
-COPY ./docker_env/requirements-all.txt .
-RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements.txt
-RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements-all.txt
+RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt
--- a/docker_env/web/Dockerfile
+++ b/docker_env/web/Dockerfile
@@ -1,8 +1,7 @@
-FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/node14-base-web:latest
+FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:latest
 WORKDIR /web/
 COPY web/. .
-RUN npm install --registry=https://registry.npm.taobao.org
-RUN npm run build
+RUN cnpm run build

 FROM nginx:alpine
 COPY ./docker_env/nginx/my.conf /etc/nginx/conf.d/my.conf
--- a/docker_env/web/DockerfileBuild
+++ b/docker_env/web/DockerfileBuild
@@ -1,4 +1,4 @@
 FROM node:14-alpine
-WORKDIR /web/
+WORKDIR /
 COPY ./web/package.json .
-RUN npm install --registry=https://registry.npm.taobao.org
+RUN npm install -g cnpm --registry=https://registry.npm.taobao.org && cnpm install --registry=https://registry.npm.taobao.org
--- a/web/.env
+++ b/web/.env
@@ -1,5 +1,5 @@
 # port 端口号
-VITE_PORT = 8888
+VITE_PORT = 8080

 # open 运行 npm run dev 时自动打开浏览器
 VITE_OPEN = false
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,4 +2,4 @@
 ENV = 'development'

 # 本地环境接口地址
-VITE_API_URL = 'http://192.168.1.246:8000/'
+VITE_API_URL = 'http://127.0.0.1:8000'
--- a/web/package.json
+++ b/web/package.json
@@ -24,6 +24,7 @@
    "element-plus": "^2.2.9",
    "js-cookie": "^3.0.1",
    "jsplumb": "^2.15.6",
+    "lodash-es": "^4.17.21",
    "mitt": "^3.0.0",
    "nprogress": "^0.2.0",
    "pinia": "^2.0.16",