Avoid compose plugin download during image build

This commit is contained in:
Rixuan Shao
2026-05-30 01:19:58 +08:00
parent f2d490dd71
commit 706bd6a19f
3 changed files with 10 additions and 6 deletions

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
*.sh text eol=lf

View File

@@ -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 . .

View File

@@ -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