1

Makefile

@@ -196,6 +196,7 @@ go-check:
 	fi
 
 .PHONY: git-check
+	 make e2e-test TARGET_URL="192.168"
 git-check:
 	@if git lfs >/dev/null 2>&1 ; then : ; else \
 		echo "Gitea requires git with lfs support to run tests." ; \
@@ -918,15 +919,23 @@ generate-manpage: ## generate manpage
 .PHONY: devstar
 devstar:
 	docker build -t devstar-studio:latest -f docker/Dockerfile.devstar .
-	
+
 .PHONY: docker
 docker:
 	docker build -t devstar.cn/devstar/webterminal:latest -f docker/Dockerfile.webTerminal .
 
 	docker build --disable-content-trust=false -t $(DOCKER_REF) .
-# support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify"  .
+# support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify"
+
+
+ifeq ($(TARGET_URL),)
+  E2E_DEPS = devstar
+else
+  E2E_DEPS =
+endif
+
 .PHONY:	e2e-test
-e2e-test:
+e2e-test: $(E2E_DEPS)
 	@echo	"正在启动E2E-TEST..."
 	@TARGET_URL=$(TARGET_URL) ./tests/e2e/run-e2e-tests.sh
 

tests/e2e/docker-compose.test.yml

@@ -3,23 +3,14 @@ version: '3.8'
 services:
   # 服务一: DevStar
   devstar:
-    # 我们不再拉取镜像
-    # image: mengning997/devstar-studio:latest
-    # pull_policy: always 
-    # 我们告诉 Compose 在本地构建
-    build:
-      context: ../..
-      dockerfile: docker/Dockerfile.devstar # 
-    
-    image: devstar-e2e-test:latest #
+    #现在make devstar负责构建镜像
+    image: devstar-studio:latest
     pull_policy: never
     ports:
       - "80:3000"
       - "2222:2222"
     volumes:
-    # 挂载 Docker Socket，允许 DevStar 创建 Devcontainer
       - /var/run/docker.sock:/var/run/docker.sock
-    # 挂载数据卷，使用相对路径，保证测试环境可移植
       - ./test-data/devstar_data:/var/lib/gitea
       - ./test-data/devstar_data:/etc/gitea
     # 健康检查。test-runner 会等待这个检查通过

tests/e2e/run-e2e-tests.sh

@@ -14,7 +14,6 @@ echo "===== [1/5] 清理旧的测试环境... ====="
 # 彻底销毁旧的 compose 环境，-v 会删除关联的数据卷
 docker compose -f tests/e2e/docker-compose.test.yml down -v --remove-orphans
 docker image prune -f
-docker builder prune -f
 # 清理并重建报告和数据目录
 sudo rm -rf ./tests/e2e/reports ./tests/e2e/test-data
 mkdir -p ./tests/e2e/reports/html ./tests/e2e/test-data/devstar_data
@@ -31,12 +30,7 @@ echo "权限设置完成。"
 echo ""
 
 echo "===== [3/5] 构建/拉取依赖镜像... ====="
-# 根据 Dockerfile 里的注释 ，我们必须先在本地构建这两个“地基”
-echo "正在构建 dev-container 基础镜像..."
-docker build -t devstar.cn/devstar/devstar-dev-container:latest -f docker/Dockerfile.devContainer . 
-
-echo "正在构建 runtime-container 基础镜像..."
-docker build -t devstar.cn/devstar/devstar-runtime-container:latest -f docker/Dockerfile.runtimeContainer . 
+#现在make devstar 处理镜像的构建
 
 echo "===== [4/5] 启动并运行测试... ====="