diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index 84e3adab..7cb792d0 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -45,7 +45,7 @@ jobs: - uses: actions/checkout@v3 - uses: pnpm/action-setup@v2 with: - version: latest + version: '8.3.1' - uses: actions/setup-node@v3 with: @@ -99,7 +99,7 @@ jobs: - uses: actions/checkout@v3 - uses: pnpm/action-setup@v2 with: - version: latest + version: '8.3.1' - uses: actions/setup-node@v3 with: cache: 'pnpm' diff --git a/README-en.md b/README-en.md index e81e7b8e..30c7c4a7 100644 --- a/README-en.md +++ b/README-en.md @@ -198,7 +198,7 @@ $ git clone git@github.com:whyour/qinglong.git $ cd qinglong $ cp .env.example .env # Recommended use pnpm https://pnpm.io/zh/installation -$ npm install -g pnpm +$ npm install -g pnpm@8.3.1 $ pnpm install $ pnpm start ``` diff --git a/README.md b/README.md index c2b4a574..c688a5cd 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,7 @@ $ git clone git@github.com:whyour/qinglong.git $ cd qinglong $ cp .env.example .env # 推荐使用 pnpm https://pnpm.io/zh/installation -$ npm install -g pnpm +$ npm install -g pnpm@8.3.1 $ pnpm install $ pnpm start ``` diff --git a/docker/Dockerfile b/docker/Dockerfile index 52a69504..4f743b98 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ COPY package.json .npmrc pnpm-lock.yaml /tmp/build/ RUN set -x \ && apk update \ && apk add nodejs npm git \ - && npm i -g pnpm \ + && npm i -g pnpm@8.3.1 \ && cd /tmp/build \ && pnpm --registry https://registry.npmmirror.com install --prod @@ -49,7 +49,7 @@ RUN set -x \ && git config --global user.email "qinglong@@users.noreply.github.com" \ && git config --global user.name "qinglong" \ && git config --global http.postBuffer 524288000 \ - && npm install -g pnpm \ + && npm install -g pnpm@8.3.1 \ && cd && pnpm config set registry https://registry.npmmirror.com \ && pnpm add -g pm2 tsx \ && rm -rf /root/.pnpm-store \ @@ -72,7 +72,7 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/ WORKDIR ${QL_DIR} -HEALTHCHECK --interval=5s --timeout=2s --retries=10 \ +HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ CMD curl -sf http://127.0.0.1:5400/api/health || exit 1 ENTRYPOINT ["./docker/docker-entrypoint.sh"] diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 16875040..b84a1d07 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -23,7 +23,7 @@ current_npm_registry=$(cd && pnpm config get registry) is_equal_registry=$(echo $current_npm_registry | grep "${NpmMirror}") if [[ "$is_equal_registry" == "" ]]; then cd && pnpm config set registry $NpmMirror - pnpm install -g --force + pnpm install -g fi update_depend echo diff --git a/shell/check.sh b/shell/check.sh index 71a9da3c..763e31b1 100755 --- a/shell/check.sh +++ b/shell/check.sh @@ -6,13 +6,11 @@ reset_env() { echo -e "---> 配置文件检测完成\n" echo -e "---> 2. 开始安装青龙依赖\n" - rm -rf $dir_root/node_modules npm_install_2 $dir_root echo -e "---> 青龙依赖安装完成\n" echo -e "---> 3. 开始安装脚本依赖\n" cp -f $dir_sample/package.json $dir_scripts/package.json - rm -rf $dir_scripts/node_modules npm_install_2 $dir_scripts echo -e "---> 脚本依赖安装完成\n" } @@ -84,7 +82,7 @@ start_public() { main() { echo -e "=====> 开始检测" - npm i -g pnpm + npm i -g pnpm@8.3.1 patch_version apk add procps @@ -94,7 +92,7 @@ main() { fi if [[ $NpmMirror ]]; then cd && pnpm config set registry $NpmMirror - pnpm install -g --force + pnpm install -g fi pnpm add -g pm2 tsx