open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-27 22:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'whyour:develop' into erma0-patch-1

Browse Source
This commit is contained in:
二毛 2022-05-29 16:28:34 +08:00 committed by GitHub
commit 441a04d0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
back/loaders/initData.ts
View File

@ -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'); const groups = _.groupBy(docs, 'type');
for (const key in groups) { const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
if (Object.prototype.hasOwnProperty.call(groups, key)) { for (const key of keys) {
const group = groups[key]; const group = groups[key];
const depIds = group.map((x) => x.id); const depIds = group.map((x) => x.id);
await dependenceService.reInstall(depIds as number[]); await dependenceService.reInstall(depIds as number[]);
}
} }
}); });

5
docker/Dockerfile
View File

@ -5,7 +5,8 @@ LABEL maintainer="${QL_MAINTAINER}"
ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
ARG QL_BRANCH=master 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 \ LANG=zh_CN.UTF-8 \
SHELL=/bin/bash \ SHELL=/bin/bash \
PS1="\u@\h:\w \$ " \ 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.email "qinglong@@users.noreply.github.com" \
&& git config --global user.name "qinglong" \ && git config --global user.name "qinglong" \
&& npm install -g pnpm \ && npm install -g pnpm \
&& pnpm setup \
&& source ~/.bashrc \
&& pnpm add -g pm2 ts-node typescript tslib \ && pnpm add -g pm2 ts-node typescript tslib \
&& git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \ && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
&& cd ${QL_DIR} \ && cd ${QL_DIR} \