diff --git a/back/loaders/initData.ts b/back/loaders/initData.ts index b541926f..00b99025 100644 --- a/back/loaders/initData.ts +++ b/back/loaders/initData.ts @@ -21,14 +21,17 @@ export default async () => { ); // 初始化时安装所有处于安装中,安装成功,安装失败的依赖 - DependenceModel.findAll({ where: {}, raw: true }).then(async (docs) => { + DependenceModel.findAll({ + where: {}, + order: [['type', 'DESC']], + raw: true, + }).then(async (docs) => { const groups = _.groupBy(docs, 'type'); - for (const key in groups) { - if (Object.prototype.hasOwnProperty.call(groups, key)) { - const group = groups[key]; - const depIds = group.map((x) => x.id); - await dependenceService.reInstall(depIds as number[]); - } + const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a)); + for (const key of keys) { + const group = groups[key]; + const depIds = group.map((x) => x.id); + await dependenceService.reInstall(depIds as number[]); } }); diff --git a/docker/Dockerfile b/docker/Dockerfile index 80709e04..f2231275 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,8 @@ LABEL maintainer="${QL_MAINTAINER}" ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git ARG QL_BRANCH=master -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \ +ENV PNPM_HOME=/root/.local/share/pnpm \ + PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \ LANG=zh_CN.UTF-8 \ SHELL=/bin/bash \ PS1="\u@\h:\w \$ " \ @@ -38,8 +39,6 @@ RUN set -x \ && git config --global user.email "qinglong@@users.noreply.github.com" \ && git config --global user.name "qinglong" \ && npm install -g pnpm \ - && pnpm setup \ - && source ~/.bashrc \ && pnpm add -g pm2 ts-node typescript tslib \ && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \ && cd ${QL_DIR} \