From e591a7117ddc4bc40c81b5cc9519360754f03c1d Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Wed, 16 Aug 2023 18:53:08 +0800 Subject: [PATCH 1/2] feat: add PROXY_HOST to update --- update | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/update b/update index b72b5700..3d62dadc 100644 --- a/update +++ b/update @@ -1,27 +1,27 @@ #!/bin/bash -if [ "${MOVIEPILOT_CN_UPDATE}" = "true" ]; then - GITHUB_URL="https://ghproxy.com/https://github.com" - GITHUBUSERCONTENT_URL="https://ghproxy.com/https://raw.githubusercontent.com" +if [ -n "${PROXY_HOST}" ]; then + CURL_OPTIONS="-sL -x ${PROXY_HOST}" + echo "使用代理更新程序" else - GITHUB_URL="https://github.com" - GITHUBUSERCONTENT_URL="https://raw.githubusercontent.com" + CURL_OPTIONS="-sL" + echo "不使用代理更新程序" fi old_version=$(cat /app/version.py) if [[ "${old_version}" == *APP_VERSION* ]]; then current_version=v$(echo ${old_version} | sed -ne "s/APP_VERSION\s=\s'v\(.*\)'/\1/gp") echo "当前版本号:${current_version}" - new_version=$(curl -s "https://api.github.com/repos/jxxghp/MoviePilot/releases/latest" | jq -r .tag_name) + new_version=$(curl ${CURL_OPTIONS} "https://api.github.com/repos/jxxghp/MoviePilot/releases/latest" | jq -r .tag_name) if [[ "${new_version}" == *v* ]]; then release_version=${new_version} echo "最新版本号:${release_version}" if [ "${current_version}" != "${release_version}" ]; then echo "发现新版本,开始更新程序..." - curl -sL "${GITHUB_URL}/jxxghp/MoviePilot/archive/refs/tags/${release_version}.zip" | busybox unzip -d /tmp - + curl ${CURL_OPTIONS} "https://github.com/jxxghp/MoviePilot/archive/refs/tags/${release_version}.zip" | busybox unzip -d /tmp - if [ $? -eq 0 ]; then echo "后端下载成功" - curl -sL "${GITHUB_URL}/jxxghp/MoviePilot-Frontend/releases/download/${release_version}/dist.zip" | busybox unzip -d /tmp - + curl ${CURL_OPTIONS} "https://github.com/jxxghp/MoviePilot-Frontend/releases/download/${release_version}/dist.zip" | busybox unzip -d /tmp - if [ $? -eq 0 ]; then echo "前端下载成功" rm -rf /app From f9c6cd1e3d5342fece18b00cc41ebc9b982b3674 Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Wed, 16 Aug 2023 18:55:03 +0800 Subject: [PATCH 2/2] docs: update --- Dockerfile | 1 - README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13480ba9..77d0b0b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ ENV LANG="C.UTF-8" \ PGID=0 \ UMASK=000 \ MOVIEPILOT_AUTO_UPDATE=true \ - MOVIEPILOT_CN_UPDATE=false \ NGINX_PORT=3000 \ CONFIG_DIR="/config" \ API_TOKEN="moviepilot" \ diff --git a/README.md b/README.md index 446b36d6..21dcf688 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,6 @@ docker pull jxxghp/moviepilot:latest - **PGID**:运行程序用户的`gid`,默认`0` - **UMASK**:掩码权限,默认`000`,可以考虑设置为`022` - **MOVIEPILOT_AUTO_UPDATE**:重启更新,`true`/`false`,默认`true` -- **MOVIEPILOT_CN_UPDATE**:重启更新是否使用国内加速,`true`/`false`,默认`false ` - **NGINX_PORT:** WEB服务端口,默认`3000`,可自行修改,但不能为`3001` - **SUPERUSER:** 超级管理员用户名,默认`admin`,安装后使用该用户登录后台管理界面 - **SUPERUSER_PASSWORD:** 超级管理员初始密码,默认`password`,建议修改为复杂密码