From 49ef5cd61fdb8f6fcc135422238fea1c104093e2 Mon Sep 17 00:00:00 2001 From: whyour Date: Sun, 29 May 2022 10:02:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpnpm=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 80709e04..c26acddd 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 \$ " \ From c0f0da4e96b82cb94bd272e2182c2981d70ce522 Mon Sep 17 00:00:00 2001 From: whyour Date: Sun, 29 May 2022 10:18:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c26acddd..02dedaf6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="${QL_MAINTAINER}" ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git ARG QL_BRANCH=master -ENV PNPM_HOME="/root/.local/share/pnpm" +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 \ From e18710a30a5ad9d101de6d88b88dc17ca3ec5b45 Mon Sep 17 00:00:00 2001 From: whyour Date: Sun, 29 May 2022 11:13:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 02dedaf6..f2231275 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="${QL_MAINTAINER}" ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git ARG QL_BRANCH=master -ENV PNPM_HOME="/root/.local/share/pnpm" \ +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 \ @@ -39,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} \ From 6b8fd94f0cd4ff8004793ba002231521275bd64e Mon Sep 17 00:00:00 2001 From: whyour Date: Sun, 29 May 2022 11:35:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E4=BE=9D=E8=B5=96=E4=BC=98=E5=85=88=E5=AE=89?= =?UTF-8?q?=E8=A3=85linux=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/loaders/initData.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/back/loaders/initData.ts b/back/loaders/initData.ts index b541926f..a810ccf0 100644 --- a/back/loaders/initData.ts +++ b/back/loaders/initData.ts @@ -21,7 +21,11 @@ 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)) { From b55c7d5747271b0463256d8a4a02edce2e6f981d Mon Sep 17 00:00:00 2001 From: whyour Date: Sun, 29 May 2022 15:01:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=A1=BA=E5=BA=8F=EF=BC=8C=E4=BC=98=E5=85=88?= =?UTF-8?q?linux=E4=BE=9D=E8=B5=96=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/loaders/initData.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/back/loaders/initData.ts b/back/loaders/initData.ts index a810ccf0..00b99025 100644 --- a/back/loaders/initData.ts +++ b/back/loaders/initData.ts @@ -27,12 +27,11 @@ export default async () => { 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[]); } });