修复用户认证字段,添加rebuild命令

This commit is contained in:
whyour 2021-03-21 19:34:41 +08:00
parent baa16d8ab2
commit b264c91846
4 changed files with 31 additions and 3 deletions

View File

@ -41,13 +41,13 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
&& ln -sf ${JD_DIR}/shell/export_sharecodes.sh /usr/local/bin/export_sharecodes \
&& ln -sf ${JD_DIR}/shell/git_diy.sh /usr/local/bin/diy \
&& ln -sf ${JD_DIR}/shell/notify.sh /usr/local/bin/notify \
&& ln -sf ${JD_DIR}/shell/rebuild.sh /usr/local/bin/rebuild \
&& yarn install \
&& yarn build \
&& yarn build-back \
&& yarn install --production \
&& git clone -b ${JD_SCRIPTS_BRANCH} ${JD_SCRIPTS_URL} ${JD_DIR}/scripts \
&& cd ${JD_DIR}/scripts \
&& npm install --production\
&& npm install \
&& npm install -g pm2 \
&& rm -rf /root/.npm
WORKDIR ${JD_DIR}

View File

@ -1 +1 @@
{"user":"admin","password":"adminadmin"}
{ "username": "admin", "password": "adminadmin" }

View File

@ -1,6 +1,8 @@
# 更新你需要的仓库的代码
55 2,13 * * * bash git_pull >> ${JD_DIR}/log/git_pull.log 2>&1
30 * * * * bash diy i-chenzhe qx >> ${JD_DIR}/log/diy_pull.log 2>&1
# 重新build面板
# 30 7 */7 * * bash rebuild >> ${JD_DIR}/log/rebuild.log 2>&1
# 删除 RmLogDaysAgo 指定天数以前的旧日志,本行为不记录日志
57 13 * * * bash rm_log >/dev/null 2>&1

26
shell/rebuild.sh Normal file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env bash
ShellDir=${JD_DIR:-$(cd $(dirname $0); pwd)}
JD_DIR=/jd
echo -e "更新shell...\n"
cd ${ShellDir}
git fetch --all
git stash
git pull
git stash pop
git reset --mixed
echo -e "更新shell完成...\n"
echo -e "重新build...\n"
yarn install
yarn build
yarn build-back
echo -e "重新build完成...\n"
echo -e "重启服务...\n"
pm2 start ${JD_DIR}/build/app.js
nginx -s reload
echo -e "重启服务完成...\n"