Skip to content

Commit 0074481

Browse files
authored
Merge pull request #13 from fairyfan1998/fix/scripts
feature: 脚本流程化
2 parents 521eeff + accd1d1 commit 0074481

File tree

144 files changed

+421
-13924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+421
-13924
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,4 @@ docs/.vuepress/dist/
116116

117117
# TernJS port file
118118
.tern-port
119+
/docs/.vuepress/.temp/

Dockerfile

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
1-
# 安装node 作为基础构建镜像
2-
# FROM node:12.6.0-alpine AS build_base
3-
FROM node AS build_base
4-
5-
# 镜像标签
6-
LABEL version="Beta1.0"
7-
LABEL description="JavaScriptCollection文档合集、博客"
8-
# 作者信息
9-
LABEL author="【Github&公众号】:Rong姐姐好可爱"
10-
LABEL email="fairy@2925.com"
1+
## 注意:vite构建需要支持node14以上,安装node16较为稳妥
2+
FROM registry.cn-hangzhou.aliyuncs.com/142vip/node:16.12.0-alpine AS build_base
113

4+
LABEL version="Beta1.0" description="JavaScriptCollection文档合集、博客"
5+
LABEL author="【Github&公众号】:Rong姐姐好可爱" email="fairy@2925.com"
6+
RUN mkdir -p /apps
127
## 确定工作空间 /apps
138
COPY . /apps
149
WORKDIR /apps
1510

1611
## 安装依赖
17-
RUN npm install && npm run build
12+
RUN npm ci --registry https://registry.npmmirror.com && npm run build
1813

1914
# 设置部署镜像
20-
FROM nginx
15+
FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:latest
2116

2217
# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 注意:--from参数
2318
COPY --from=build_base /apps/docs/.vuepress/dist/ /usr/share/nginx/html/
2419

25-
26-
## 暴露端口
27-
EXPOSE 80
20+
COPY nginx.conf /etc/nginx/
21+
EXPOSE 7100
22+
CMD ["nginx", "-g", "daemon off;"]

docker-compose.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: '2'
2+
services:
3+
### JavaScriptCollection服务,ip范围 172.30.0.100
4+
JavaScriptCollection:
5+
image: registry.cn-hangzhou.aliyuncs.com/142vip/cs_:latest
6+
container_name: JavaScriptCollection
7+
hostname: JavaScriptCollection
8+
ports:
9+
- "7100:80"
10+
networks:
11+
net:
12+
ipv4_address: 172.30.0.100
13+
14+
## 创建桥接网络
15+
networks:
16+
## 桥接网络名称,配合文件前缀,最后为dev_test_env_net 参考:https://www.jianshu.com/p/d70c61d45364
17+
net:
18+
driver: bridge
19+
# external: true
20+
ipam:
21+
driver: default
22+
config:
23+
- subnet: 172.30.0.0/24
24+
## 网关
25+
gateway: 172.30.0.1

docs/.vuepress/.temp/internal/clientAppEnhances.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/.vuepress/.temp/internal/clientAppRootComponents.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/.vuepress/.temp/internal/clientAppSetups.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/.vuepress/.temp/internal/layoutComponents.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

docs/.vuepress/.temp/internal/pagesComponents.js

Lines changed: 0 additions & 54 deletions
This file was deleted.

docs/.vuepress/.temp/internal/pagesData.js

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)