diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 6b57ac32..b7f9cc78 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -166,7 +166,7 @@ jobs: flavor: | latest=false tags: | - type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }} + type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'debian-dev') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }} type=raw,value=${{ steps.version.outputs.version }}-debian,enable=${{ github.ref == format('refs/heads/{0}', 'debian') }} type=semver,pattern={{version}} diff --git a/shell/start.sh b/shell/start.sh index 083e228b..b01902e0 100644 --- a/shell/start.sh +++ b/shell/start.sh @@ -93,16 +93,15 @@ log_with_style() { printf "\n[%s] [%7s] %s\n" "${timestamp}" "${level}" "${message}" } -log_with_style "INFO" "🚀 1. 检测配置文件..." +log_with_style "INFO" "🚀 1. 检测配置文件..." import_config "$@" make_dir /etc/nginx/conf.d make_dir /run/nginx -init_nginx fix_config pm2 l &>/dev/null -log_with_style "INFO" "🔄 2. 启动 nginx..." +log_with_style "INFO" "🔄 2. 启动 nginx..." nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf log_with_style "INFO" "⚙️ 3. 启动 pm2 服务..."