fix: add release preflight for cli

dengmengmian · dengmengmian · commit dd9cb921e90f · 2026-05-19T21:24:39.000+08:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,5 @@
+*
+!Dockerfile
+!src-tauri/
+!src-tauri/**
+src-tauri/target/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,16 @@ permissions:
   contents: write
 
 jobs:
+  preflight:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Docker preflight
+        run: bash scripts/release-preflight.sh
+
   build:
+    needs: preflight
     strategy:
       fail-fast: false
       matrix:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.2] - 2026-05-19
+
+### Fixes / 修复
+
+- 修复 `agentgate-serve` 未适配网关启动返回值导致 CLI 多平台构建失败的问题
+- 修复 Docker/默认 CLI 启动未读取 `AGENTGATE_HOST` 和 `AGENTGATE_PORT` 的问题
+
+### CI / 发布
+
+- 新增 Docker release preflight，发版前构建并启动 `agentgate-serve`，检查 `/health`
+- 修复 Dockerfile 的 Rust 版本、Linux/Tauri 依赖和构建上下文体积问题
+
+---
+
 ## [0.8.1] - 2026-05-19
 
 ### Fixes / 修复
diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,42 @@
 # Build stage
-FROM rust:1.82-slim AS builder
+FROM rust:1-bookworm AS builder
 
 WORKDIR /build
 
 # Install build dependencies
-RUN apt-get update && apt-get install -y pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y \
+    pkg-config \
+    libssl-dev \
+    libwebkit2gtk-4.1-dev \
+    libappindicator3-dev \
+    librsvg2-dev \
+    patchelf \
+    && rm -rf /var/lib/apt/lists/*
 
 # Copy source
 COPY src-tauri/ ./
 
+# The desktop app build keeps Cargo autobins disabled so Tauri does not bundle
+# the headless CLI. Enable the CLI binary only inside the Docker build.
+RUN cat >> Cargo.toml <<'EOF'
+
+[[bin]]
+name = "agentgate-serve"
+path = "src/cli/serve.rs"
+EOF
+
 # Build only the headless binary
 RUN cargo build --release --bin agentgate-serve
 
 # Runtime stage
 FROM debian:bookworm-slim
 
-RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    libwebkit2gtk-4.1-0 \
+    libappindicator3-1 \
+    librsvg2-2 \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /build/target/release/agentgate-serve /usr/local/bin/agentgate-serve
 
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "agentgate",
   "private": true,
-  "version": "0.8.1",
+  "version": "0.8.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
     "preview": "vite preview",
+    "release:preflight": "bash scripts/release-preflight.sh",
     "tauri": "tauri"
   },
   "dependencies": {
diff --git a/scripts/release-preflight.sh b/scripts/release-preflight.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+image_name="${AGENTGATE_PREFLIGHT_IMAGE:-agentgate-preflight}"
+container_name="${AGENTGATE_PREFLIGHT_CONTAINER:-agentgate-preflight}"
+host_port="${AGENTGATE_PREFLIGHT_PORT:-19090}"
+
+cleanup() {
+  docker rm -f "$container_name" >/dev/null 2>&1 || true
+}
+
+trap cleanup EXIT
+
+docker build -t "$image_name" .
+
+cleanup
+docker run -d \
+  --name "$container_name" \
+  -p "127.0.0.1:${host_port}:9090" \
+  "$image_name" >/dev/null
+
+for _ in $(seq 1 30); do
+  if curl -fsS "http://127.0.0.1:${host_port}/health" >/dev/null; then
+    echo "Docker preflight passed: agentgate-serve is running."
+    exit 0
+  fi
+  sleep 1
+done
+
+docker logs "$container_name" >&2 || true
+echo "Docker preflight failed: health endpoint did not become ready." >&2
+exit 1
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agentgate"
-version = "0.8.1"
+version = "0.8.2"
 description = "Local gateway for AI coding agents"
 authors = ["dengmengmian"]
 edition = "2021"
diff --git a/src-tauri/src/cli/serve.rs b/src-tauri/src/cli/serve.rs
@@ -131,7 +131,12 @@ async fn main() {
         Some(Commands::Status) => cmd_status(&cli),
         None => {
             // Default: serve
-            cmd_serve(&cli, "127.0.0.1", 9090).await;
+            let host = std::env::var("AGENTGATE_HOST").unwrap_or_else(|_| "127.0.0.1".to_string());
+            let port = std::env::var("AGENTGATE_PORT")
+                .ok()
+                .and_then(|value| value.parse::<u16>().ok())
+                .unwrap_or(9090);
+            cmd_serve(&cli, &host, port).await;
         }
     }
 }
@@ -156,13 +161,14 @@ async fn cmd_serve(cli: &Cli, host: &str, port: u16) {
     eprintln!();
 
     match agentgate_lib::gateway::server::start(host, port, db).await {
-        Ok((_shutdown_tx, handle)) => {
+        Ok((shutdown_tx, handle, _active_requests)) => {
             eprintln!("Gateway running on http://{host}:{port}");
             eprintln!("Press Ctrl+C to stop.");
             eprintln!();
             tokio::signal::ctrl_c().await.ok();
             eprintln!("\nShutting down...");
-            drop(handle);
+            let _ = shutdown_tx.send(());
+            let _ = handle.await;
         }
         Err(e) => {
             eprintln!("Failed to start: {}", e.message);
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "AgentGate",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "identifier": "com.mengmian.agentgate",
   "build": {
     "beforeDevCommand": "pnpm dev",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://schema.tauri.app/config/2",`
`3`	`3`	`"productName": "AgentGate",`
`4`		`- "version": "0.8.1",`
	`4`	`+ "version": "0.8.2",`
`5`	`5`	`"identifier": "com.mengmian.agentgate",`
`6`	`6`	`"build": {`
`7`	`7`	`"beforeDevCommand": "pnpm dev",`