diff --git a/Dockerfile b/Dockerfile index 10a6288..44dc03f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,11 @@ RUN mkdir -p /apps COPY . /apps WORKDIR /apps ## 安装依赖 -RUN npm i --registry https://registry.npmmirror.com && npm run build +RUN npm ci --registry https://registry.npmmirror.com && npm run build -# 设置部署镜像 -FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:latest + +FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:1.23.0-alpine # 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面 注意:--from参数 COPY --from=build_base /apps/docs/.vuepress/dist/ /usr/share/nginx/html/ diff --git a/package.json b/package.json index 917bd70..54a80fe 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "dev": "vuepress dev docs", "build": "vuepress build docs", "build-image": "bash scripts/build_image.sh $npm_package_version", - "ali": "bash scripts/deploy.bash ali $npm_package_version", - "github": "bash scripts/deploy.bash github" + "ali": "bash scripts/deploy.sh ali $npm_package_version", + "github": "bash scripts/page_deploy.sh" }, "author": "Rong姐姐好可爱", "license": "MIT", diff --git a/scripts/deploy.bash b/scripts/deploy.sh similarity index 100% rename from scripts/deploy.bash rename to scripts/deploy.sh diff --git a/scripts/page_deploy.sh b/scripts/page_deploy.sh index 1af839c..ae44f93 100644 --- a/scripts/page_deploy.sh +++ b/scripts/page_deploy.sh @@ -31,14 +31,16 @@ git commit -m "refactor:${commitInfo}" ## 配置个人信息 -git config user.name "晚上吃芝士+葡萄的妹妹" -git config user.email "fairy0115@2925.com" +git config user.name '妹妹手上有抹茶' +git config user.email 'fairy_408@2925.com' + +git config --list # if you are deploying to https://.github.io # git push -f git@github.com:/.github.io.git master # if you are deploying to https://.github.io/ -git push -f https://github.com/mmdapl/JavaScriptCollection.git master:pages/github +git push https://github.com/142vip/408CSFamily.git master:pages/github cd - \ No newline at end of file