From 706bd6a19f69bf6a00aa95c7c878f21e8f39b112 Mon Sep 17 00:00:00 2001 From: Rixuan Shao <2023311022@bipt.edu.cn> Date: Sat, 30 May 2026 01:19:58 +0800 Subject: [PATCH] Avoid compose plugin download during image build --- .gitattributes | 1 + DouYinSparkFlow/Dockerfile.server | 3 --- refresh_proxy.sh | 12 +++++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfdb8b7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/DouYinSparkFlow/Dockerfile.server b/DouYinSparkFlow/Dockerfile.server index 8554fae..80a1689 100644 --- a/DouYinSparkFlow/Dockerfile.server +++ b/DouYinSparkFlow/Dockerfile.server @@ -47,9 +47,6 @@ RUN set -eux; \ && mv docker/docker /usr/bin/docker \ && chmod +x /usr/bin/docker \ && rm -rf docker docker.tgz \ - && mkdir -p /usr/local/lib/docker/cli-plugins \ - && download https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64 /usr/local/lib/docker/cli-plugins/docker-compose \ - && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose \ && rm -rf /var/lib/apt/lists/* COPY . . diff --git a/refresh_proxy.sh b/refresh_proxy.sh index 626745f..8cf76d0 100755 --- a/refresh_proxy.sh +++ b/refresh_proxy.sh @@ -62,8 +62,14 @@ ensure_line "bind-address" "'*'" ensure_line "external-controller" "'0.0.0.0:9090'" if command -v docker >/dev/null 2>&1 && [ -f "$APP_ROOT/docker-compose.yml" ]; then - proxy_id="$(docker compose -f "$APP_ROOT/docker-compose.yml" ps -q proxy 2>/dev/null || true)" - if [ -n "$proxy_id" ]; then - docker compose -f "$APP_ROOT/docker-compose.yml" restart proxy + if docker compose version >/dev/null 2>&1; then + proxy_id="$(docker compose -f "$APP_ROOT/docker-compose.yml" ps -q proxy 2>/dev/null || true)" + if [ -n "${proxy_id:-}" ]; then + docker compose -f "$APP_ROOT/docker-compose.yml" restart proxy + fi + else + if docker ps --format '{{.Names}}' 2>/dev/null | grep -qx mihomo; then + docker restart mihomo + fi fi fi