配置变化: docker配置优化
This commit is contained in:
@@ -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
|
||||
~~~
|
||||
|
||||
### 运行前端
|
||||
|
||||
@@ -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; }'
|
||||
|
||||
@@ -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; }'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user