admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置变化: docker配置优化

Browse Source
This commit is contained in:
李强
2023-01-25 10:06:56 +08:00
parent 4804df5079
commit 3cf64e74e8
10 changed files with 112 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
docker-compose.yml
View File

@@ -1,7 +1,7 @@
version: "3" version: "3"
services: services:
dvadmin-web: dvadmin3-web:
container_name: dvadmin-web container_name: dvadmin3-web
ports: ports:
- "8080:8080" - "8080:8080"
build: build:
@@ -17,18 +17,18 @@ services:
network: network:
ipv4_address: 177.10.0.11 ipv4_address: 177.10.0.11
dvadmin-django: dvadmin3-django:
build: build:
context: . context: .
dockerfile: ./docker_env/django/Dockerfile dockerfile: ./docker_env/django/Dockerfile
container_name: dvadmin-django container_name: dvadmin3-django
working_dir: /backend working_dir: /backend
# 打开mysql 时，打开此选项 # 打开mysql 时，打开此选项
# depends_on: # depends_on:
# - dvadmin-mysql # - dvadmin3-mysql
environment: environment:
PYTHONUNBUFFERED: 1 PYTHONUNBUFFERED: 1
DATABASE_HOST: dvadmin-mysql DATABASE_HOST: dvadmin3-mysql
TZ: Asia/Shanghai TZ: Asia/Shanghai
volumes: volumes:
- ./backend:/backend - ./backend:/backend
@@ -42,9 +42,9 @@ services:
network: network:
ipv4_address: 177.10.0.12 ipv4_address: 177.10.0.12
# dvadmin-mysql: # dvadmin3-mysql:
# image: mysql:5.7 # image: mysql:5.7
# container_name: dvadmin-mysql # container_name: dvadmin3-mysql
# #使用该参数，container内的root拥有真正的root权限，否则，container内的root只是外部的一个普通用户权限 # #使用该参数，container内的root拥有真正的root权限，否则，container内的root只是外部的一个普通用户权限
# #设置为true，不然数据卷可能挂载不了，启动不起 # #设置为true，不然数据卷可能挂载不了，启动不起
## privileged: true ## privileged: true
@@ -53,7 +53,7 @@ services:
# - "3306:3306" # - "3306:3306"
# environment: # environment:
# MYSQL_ROOT_PASSWORD: "123456" # MYSQL_ROOT_PASSWORD: "123456"
# MYSQL_DATABASE: "dvadmin_pro" # MYSQL_DATABASE: "dvadmin3_pro"
# TZ: Asia/Shanghai # TZ: Asia/Shanghai
# command: # command:
# --wait_timeout=31536000 # --wait_timeout=31536000
@@ -70,18 +70,18 @@ services:
# 如果使用celery 插件，请自行打开此注释 # 如果使用celery 插件，请自行打开此注释
# dvadmin-celery: # dvadmin3-celery:
# build: # build:
# context: . # context: .
# dockerfile: ./docker_env/celery/Dockerfile # dockerfile: ./docker_env/celery/Dockerfile
# # image: django:2.2 # # image: django:2.2
# container_name: dvadmin-celery # container_name: dvadmin3-celery
# working_dir: /backend # working_dir: /backend
# depends_on: # depends_on:
# - dvadmin-mysql # - dvadmin3-mysql
# environment: # environment:
# PYTHONUNBUFFERED: 1 # PYTHONUNBUFFERED: 1
# DATABASE_HOST: dvadmin-mysql # DATABASE_HOST: dvadmin3-mysql
# TZ: Asia/Shanghai # TZ: Asia/Shanghai
# volumes: # volumes:
# - ./backend:/backend # - ./backend:/backend
@@ -92,9 +92,9 @@ services:
# ipv4_address: 177.10.0.14 # ipv4_address: 177.10.0.14
# dvadmin-redis: # dvadmin3-redis:
# image: redis:6.2.6-alpine # 指定服务镜像，最好是与之前下载的redis配置文件保持一致 # image: redis:6.2.6-alpine # 指定服务镜像，最好是与之前下载的redis配置文件保持一致
# container_name: dvadmin-redis # 容器名称 # container_name: dvadmin3-redis # 容器名称
# restart: on-failure # 重启方式 # restart: on-failure # 重启方式
# environment: # environment:
# - TZ=Asia/Shanghai # 设置时区 # - TZ=Asia/Shanghai # 设置时区

8
docker_env/README.md
View File

@@ -4,9 +4,9 @@
~~~sh ~~~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 ~~~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
~~~ ~~~
### 运行前端 ### 运行前端

2
docker_env/celery/Dockerfile
View File

@@ -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 WORKDIR /backend
COPY ./backend/ . COPY ./backend/ .
RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }' RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }'

2
docker_env/django/Dockerfile
View File

@@ -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 WORKDIR /backend
COPY ./backend/ . COPY ./backend/ .
RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }' RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py ./conf/env.py "; print "n" |cmd; }'

4
docker_env/django/DockerfileBuild
View File

@@ -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 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 WORKDIR /backend
COPY ./backend/requirements.txt . 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.txt
RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements-all.txt

5
docker_env/web/Dockerfile
View File

@@ -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/ WORKDIR /web/
COPY web/. . COPY web/. .
RUN npm install --registry=https://registry.npm.taobao.org RUN cnpm run build
RUN npm run build
FROM nginx:alpine FROM nginx:alpine
COPY ./docker_env/nginx/my.conf /etc/nginx/conf.d/my.conf COPY ./docker_env/nginx/my.conf /etc/nginx/conf.d/my.conf

4
docker_env/web/DockerfileBuild
View File

@@ -1,4 +1,4 @@
FROM node:14-alpine FROM node:14-alpine
WORKDIR /web/ WORKDIR /
COPY ./web/package.json . 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

4
web/.env
View File

@@ -1,8 +1,8 @@
# port 端口号 # port 端口号
VITE_PORT = 8888 VITE_PORT = 8080
# open 运行 npm run dev 时自动打开浏览器 # open 运行 npm run dev 时自动打开浏览器
VITE_OPEN = false VITE_OPEN = false
# public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可 # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
VITE_PUBLIC_PATH = /vue-next-admin-preview/ VITE_PUBLIC_PATH = /vue-next-admin-preview/

2
web/.env.development
View File

@@ -2,4 +2,4 @@
ENV = 'development' ENV = 'development'
# 本地环境接口地址 # 本地环境接口地址
VITE_API_URL = 'http://192.168.1.246:8000/' VITE_API_URL = 'http://127.0.0.1:8000'

165
web/package.json
View File

@@ -1,84 +1,85 @@
{ {
"name": "vue-next-admin", "name": "vue-next-admin",
"version": "2.2.0", "version": "2.2.0",
"description": "vue3 vite next admin template", "description": "vue3 vite next admin template",
"author": "lyt_20201208", "author": "lyt_20201208",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vite --force", "dev": "vite --force",
"build": "vite build", "build": "vite build",
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.0.6", "@element-plus/icons-vue": "^2.0.6",
"@fast-crud/fast-crud": "^1.4.2", "@fast-crud/fast-crud": "^1.4.2",
"@fast-crud/ui-element": "^1.4.2", "@fast-crud/ui-element": "^1.4.2",
"@vitejs/plugin-vue-jsx": "^2.1.0", "@vitejs/plugin-vue-jsx": "^2.1.0",
"@wangeditor/editor": "^5.1.11", "@wangeditor/editor": "^5.1.11",
"axios": "^0.27.2", "axios": "^0.27.2",
"countup.js": "^2.3.2", "countup.js": "^2.3.2",
"cropperjs": "^1.5.12", "cropperjs": "^1.5.12",
"echarts": "^5.3.3", "echarts": "^5.3.3",
"echarts-gl": "^2.0.9", "echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.0.0", "echarts-wordcloud": "^2.0.0",
"element-plus": "^2.2.9", "element-plus": "^2.2.9",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "lodash-es": "^4.17.21",
"nprogress": "^0.2.0", "mitt": "^3.0.0",
"pinia": "^2.0.16", "nprogress": "^0.2.0",
"print-js": "^1.6.0", "pinia": "^2.0.16",
"qrcodejs2-fixes": "^0.0.2", "print-js": "^1.6.0",
"screenfull": "^6.0.2", "qrcodejs2-fixes": "^0.0.2",
"sortablejs": "^1.15.0", "screenfull": "^6.0.2",
"splitpanes": "^3.1.1", "sortablejs": "^1.15.0",
"vue": "^3.2.37", "splitpanes": "^3.1.1",
"vue-clipboard3": "^2.0.0", "vue": "^3.2.37",
"vue-grid-layout": "^3.0.0-beta1", "vue-clipboard3": "^2.0.0",
"vue-i18n": "^9.1.10", "vue-grid-layout": "^3.0.0-beta1",
"vue-router": "^4.1.2" "vue-i18n": "^9.1.10",
}, "vue-router": "^4.1.2"
"devDependencies": { },
"@types/node": "^18.0.6", "devDependencies": {
"@types/nprogress": "^0.2.0", "@types/node": "^18.0.6",
"@types/sortablejs": "^1.13.0", "@types/nprogress": "^0.2.0",
"@typescript-eslint/eslint-plugin": "^5.30.7", "@types/sortablejs": "^1.13.0",
"@typescript-eslint/parser": "^5.30.7", "@typescript-eslint/eslint-plugin": "^5.30.7",
"@vitejs/plugin-vue": "^2.3.3", "@typescript-eslint/parser": "^5.30.7",
"@vue/compiler-sfc": "^3.2.37", "@vitejs/plugin-vue": "^2.3.3",
"dotenv": "^16.0.1", "@vue/compiler-sfc": "^3.2.37",
"eslint": "^8.20.0", "dotenv": "^16.0.1",
"eslint-plugin-vue": "^9.2.0", "eslint": "^8.20.0",
"prettier": "^2.7.1", "eslint-plugin-vue": "^9.2.0",
"sass": "^1.53.0", "prettier": "^2.7.1",
"sass-loader": "^13.0.2", "sass": "^1.53.0",
"typescript": "^4.7.4", "sass-loader": "^13.0.2",
"vite": "^3.0.0", "typescript": "^4.7.4",
"vue-eslint-parser": "^9.0.3" "vite": "^3.0.0",
}, "vue-eslint-parser": "^9.0.3"
"browserslist": [ },
"> 1%", "browserslist": [
"last 2 versions", "> 1%",
"not dead" "last 2 versions",
], "not dead"
"bugs": { ],
"url": "https://gitee.com/lyt-top/vue-next-admin/issues" "bugs": {
}, "url": "https://gitee.com/lyt-top/vue-next-admin/issues"
"engines": { },
"node": ">=12.0.0", "engines": {
"npm": ">= 6.0.0" "node": ">=12.0.0",
}, "npm": ">= 6.0.0"
"keywords": [ },
"vue", "keywords": [
"vue3", "vue",
"vuejs/vue-next", "vue3",
"element-ui", "vuejs/vue-next",
"element-plus", "element-ui",
"vue-next-admin", "element-plus",
"next-admin" "vue-next-admin",
], "next-admin"
"repository": { ],
"type": "git", "repository": {
"url": "https://gitee.com/lyt-top/vue-next-admin.git" "type": "git",
} "url": "https://gitee.com/lyt-top/vue-next-admin.git"
}
} }