From 0c4baad4a2576369a558c82477abbdb89c8f9245 Mon Sep 17 00:00:00 2001 From: WeiCHEN Date: Tue, 22 Sep 2026 21:24:20 +0800 Subject: [PATCH] fix(infra): align ready health, drop events shared-net, pin Go 1.27.1, short-skip docker smoke T20-I2/I3/I5/I8: dev compose /api/v1/ready, main events networks match test/dev, Dockerfile golang:1.27.1-bookworm, and testing.Short skip for pi-agent docker build. --- deploy/app/Dockerfile | 2 +- docker-compose.dev.yml | 2 +- docker-compose.main.yml | 1 - internal/agent/pi_runner_image_test.go | 3 +++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/app/Dockerfile b/deploy/app/Dockerfile index 4aac760a..89a0a508 100644 --- a/deploy/app/Dockerfile +++ b/deploy/app/Dockerfile @@ -9,7 +9,7 @@ RUN npm ci COPY web/ ./ RUN npm run build -FROM golang:1.23-bookworm AS go-builder +FROM golang:1.27.1-bookworm AS go-builder # GOPROXY defaults to the official proxy to preserve upstream build behavior. # Hosts behind networks that cannot reach proxy.golang.org can pass a diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 2fd77ce2..1fec7a60 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -135,7 +135,7 @@ services: ports: - "${APP_PUBLISH_HOST:-127.0.0.1}:${HTTP_PORT:-8080}:${HTTP_PORT:-8080}" healthcheck: - test: ["CMD", "curl", "-fsS", "http://127.0.0.1:${HTTP_PORT:-8080}/api/v1/health"] + test: ["CMD", "curl", "-fsS", "http://127.0.0.1:${HTTP_PORT:-8080}/api/v1/ready"] interval: 10s timeout: 5s retries: 6 diff --git a/docker-compose.main.yml b/docker-compose.main.yml index 0c4d2877..8cdc7cb2 100644 --- a/docker-compose.main.yml +++ b/docker-compose.main.yml @@ -184,7 +184,6 @@ services: restart: always networks: - main-net - - shared-net networks: main-net: diff --git a/internal/agent/pi_runner_image_test.go b/internal/agent/pi_runner_image_test.go index 1666135c..7cf4e15a 100644 --- a/internal/agent/pi_runner_image_test.go +++ b/internal/agent/pi_runner_image_test.go @@ -66,6 +66,9 @@ func TestPiAgentDockerfileCopiesRunnerRelativeImports(t *testing.T) { } func TestPiAgentDockerBuildContext_RunnerModulesPresent(t *testing.T) { + if testing.Short() { + t.Skip("docker build smoke skipped under -short") + } if _, err := exec.LookPath("docker"); err != nil { t.Skip("docker CLI not available") }