Skip to content

Commit

Permalink
Merge pull request #127 from monlor/test
Browse files Browse the repository at this point in the history
fix: 🐛 alist进程守护和更新服务冲突
  • Loading branch information
monlor authored Jun 16, 2024
2 parents 782c476 + 257498e commit b61ea4f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
18 changes: 14 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,29 @@
bash -c "$(curl -fsSL https://raw.githubusercontent.com/monlor/docker-xiaoya/main/install.sh)"
```

使用加速源(我的加速源也可能帮你减速🤣)
**使用加速源**

```bash
export GH_PROXY=https://gh.monlor.com/ IMAGE_PROXY=ghcr.monlor.com && bash -c "$(curl -fsSL ${GH_PROXY}https://raw.githubusercontent.com/monlor/docker-xiaoya/main/install.sh)"
```

**环境信息**

| 类型 | 地址 | 默认用户密码 |
| --- | --- | --- |
| alist | http://ip:5678 | - |
| webdav | http://ip:5678/dav | guest/guest_Api789 |
| tvbox | http://ip:5678/tvbox/my_ext.json | - |
| emby | http://ip:2345 | xiaoya/1234 |
| jellyfin | http://ip:2346 | ailg/5678 |

### 卸载脚本

```bash
bash -c "$(curl -fsSL https://raw.githubusercontent.com/monlor/docker-xiaoya/main/uninstall.sh)"
```

使用加速源(我的加速源也可能帮你减速🤣)
**使用加速源**

```bash
export GH_PROXY=https://gh.monlor.com/ IMAGE_PROXY=ghcr.monlor.com && bash -c "$(curl -fsSL ${GH_PROXY}https://raw.githubusercontent.com/monlor/docker-xiaoya/main/uninstall.sh)"
Expand Down Expand Up @@ -82,8 +92,8 @@ export VERSION=main && bash -c "$(curl -fsSL ${GH_PROXY}https://raw.githubuserco
| ----------------- | -------- | --------- | --------- |
| Alist + Emby | 2核 | 4G | 140G |
| 仅部署 Alist | 1核 | 512M | 512M |
| Alist + Emby + Jellyfin | 2核 | 4G | 300G |
| Alist + Jellyfin | 2核 | 4G | 155G |
| Alist + Emby + Jellyfin | 4核 | 8G | 300G |
| Alist + Jellyfin | 4核 | 8G | 155G |

## 配置示例

Expand Down
5 changes: 4 additions & 1 deletion alist/service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@ download_files() {

start() {
/entrypoint.sh /opt/alist/alist server --no-prefix &
sleep 30
echo "1" > /tmp/status
}

stop() {
echo "0" > /tmp/status
kill -15 $(pgrep -f 'nginx|httpd|alist')
}

Expand All @@ -88,7 +91,7 @@ update() {
# 进程守护函数
daemon() {

if [ -z "$(pgrep alist)" ]; then
if [ -z "$(pgrep alist)" ] && [ "$(cat /tmp/status)" = "1" ]; then
start
fi

Expand Down

0 comments on commit b61ea4f

Please sign in to comment.