fix: fix login-desktop 8788 build failure (curl exit 7)

This commit is contained in:
Rixuan Shao
2026-07-02 11:16:36 +08:00
parent 8fe630f356
commit 3ae9738c46
2 changed files with 23 additions and 4 deletions
+21 -2
View File
@@ -176,8 +176,27 @@ compose_up() {
cd "$APP_ROOT"
log "Refreshing proxy configuration"
run_root bash "$APP_ROOT/refresh_proxy.sh"
log "Building and starting containers"
run_root env DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose up -d --build proxy web login-desktop scheduler
log "Starting proxy container first"
run_root env DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker compose up -d proxy
log "Waiting for proxy to be reachable on 127.0.0.1:7890"
local tries=0
while [ "$tries" -lt 30 ]; do
if curl -fsS -x http://127.0.0.1:7890 https://www.google.com -o /dev/null 2>/dev/null; then
log "Proxy is reachable"
break
fi
tries=$((tries + 1))
sleep 2
done
if [ "$tries" -ge 30 ]; then
echo "Proxy did not become reachable on 127.0.0.1:7890; the build may fail downloading docker/compose binaries." >&2
fi
log "Building and starting remaining containers"
run_root env DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 \
HTTP_PROXY_BUILD=http://127.0.0.1:7890 \
HTTPS_PROXY_BUILD=http://127.0.0.1:7890 \
ALL_PROXY_BUILD=socks5://127.0.0.1:7890 \
docker compose up -d --build web login-desktop scheduler
}
print_summary() {