Skip to content

Commit 9f5f50a

Browse files
authored
Merge pull request #14 from 142vip/feat/write
feat: 更换主题,修复一些问题
2 parents 9e684c7 + 7839f95 commit 9f5f50a

File tree

102 files changed

+4990
-3057
lines changed

Some content is hidden

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

102 files changed

+4990
-3057
lines changed

.eslintrc.js

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

.gitignore

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ logs
33
*.log
44
.vscode
55
.vscode/*
6-
npm-debug.log*
7-
yarn-debug.log*
8-
yarn-error.log*
9-
lerna-debug.log*
106
*/.DS_Store
117
.DS_Store
128
*/.vscode
@@ -32,8 +28,6 @@ coverage
3228
# nyc test coverage
3329
.nyc_output
3430

35-
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
36-
.grunt
3731

3832
# Bower dependency directory (https://bower.io/)
3933
bower_components
@@ -66,8 +60,6 @@ typings/
6660
.rts2_cache_es/
6761
.rts2_cache_umd/
6862

69-
# Optional REPL history
70-
.node_repl_history
7163

7264
# Output of 'npm pack'
7365
*.tgz
@@ -98,22 +90,12 @@ dist
9890
# vuepress build output
9991
# .vuepress/dist
10092

101-
## static resource
93+
## static resource
10294
docs/.vuepress/.cache/
10395
docs/.vuepress/.temp/
10496
docs/.vuepress/dist/
10597

10698

107-
108-
# Serverless directories
109-
.serverless/
110-
111-
# FuseBox cache
112-
.fusebox/
113-
114-
# DynamoDB Local files
115-
.dynamodb/
116-
11799
# TernJS port file
118100
.tern-port
119101
/docs/.vuepress/.temp/

Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1+
#
2+
# - 功能: 构建JavaScriptCollection镜像
3+
# - 用法: docker build -f Dockerfile --build-arg APP_VERSION=0.0.1 -t JavaScriptCollection-0.0.1 .
4+
#
15
## 注意:vite构建需要支持node14以上,安装node16较为稳妥
26
FROM registry.cn-hangzhou.aliyuncs.com/142vip/node:16.12.0-alpine AS build_base
3-
LABEL version="Beta1.0" description="JavaScriptCollection文档合集、博客"
4-
LABEL author="【Github&公众号】:Rong姐姐好可爱" email="fairy@2925.com"
7+
58
RUN mkdir -p /apps
69
## 确定工作空间 /apps
7-
COPY . /apps
810
WORKDIR /apps
11+
COPY . .
912

1013
## 安装依赖
11-
RUN npm ci --registry https://registry.npmmirror.com && npm run build
12-
13-
# 设置部署镜像
14-
FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:latest
14+
RUN npm i pnpm@6 -g && pnpm i -D && pnpm build
1515

16+
FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:1.23.0-alpine
17+
ARG APP_VERSION
18+
LABEL version=$APP_VERSION description="JavaScriptCollection文档合集、博客"
19+
LABEL author="【Github&公众号】:Rong姐姐好可爱" email="fairy@2925.com"
1620
# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 注意:--from参数
1721
COPY --from=build_base /apps/docs/.vuepress/dist/ /usr/share/nginx/html/
18-
## 配置文件
1922
COPY nginx.conf /etc/nginx/
20-
EXPOSE 7100
21-
CMD ["nginx", "-g", "daemon off;"]

Faster.Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#
2+
# - 功能: 快速构建JavaScriptCollection镜像
3+
# - 用法: docker build -f Faster.Dockerfile --build-arg APP_VERSION=0.0.1 -t JavaScriptCollection-0.0.1 .
4+
#
5+
6+
FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:1.23.0-alpine
7+
ARG APP_VERSION
8+
LABEL version=$APP_VERSION description="JavaScriptCollection文档合集、博客"
9+
LABEL author="【Github&公众号】:Rong姐姐好可爱" email="fairy_vip@2925.com"
10+
11+
# 将dist文件中的内容复制到 /usr/share/nginx/html/
12+
COPY ./docs/.vuepress/dist/ /usr/share/nginx/html/
13+
COPY nginx.conf /etc/nginx/
14+

Readme.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
>
4040
> 创建时间:2020年2月14日
4141
42-
43-
4442
<!-- ## 关于作者
4543
4644

code/grpc/egg-grpc-client/.autod.conf.js

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

code/grpc/egg-grpc-client/.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

code/grpc/egg-grpc-client/.eslintrc

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

code/grpc/egg-grpc-client/.gitignore

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

code/grpc/egg-grpc-client/.travis.yml

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

0 commit comments

Comments
 (0)