From 962e58f9af71ec24589bd5f7885ee54d0f3646bd Mon Sep 17 00:00:00 2001
From: QXYang686 <me@yqxpro.com>
Date: Sat, 14 Feb 2026 17:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9E=84=E5=BB=BA=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index b360e5b..880bab2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,25 +9,19 @@ GIT_SHA := $(shell git rev-parse --short HEAD)
 # 定义所有需要构建的子目录
 SUBDIRS = common-base develop-base universal-base
 
-# 默认目标：按顺序构建所有子目录
-all: $(SUBDIRS)
-
-# 模式规则：每个目录目标都依赖对应的目录
-%: %/
-	@echo "Building $@ Finished"
-
 # 目录构建规则
-%/:
+$(SUBDIRS):
 	@echo "Building $@..."
 	@pushd $@ && \
 		npx devcontainer build \
 			--platform linux/amd64,linux/arm64 \
-			--image-name $(REGISTRY_LOCAL)/devcontainers/$@ --push \
+			--image-name $(REGISTRY_LOCAL)/devcontainers/$@ \
 			--cache-to type=registry,ref=$(REGISTRY_LOCAL)/devcontainers/$@:buildcache,mode=max \
 			--cache-from type=registry,ref=$(REGISTRY_LOCAL)/devcontainers/$@:buildcache && \
 		docker tag $(REGISTRY_LOCAL)/devcontainers/$@ $(REGISTRY)/devcontainers/$@:$(GIT_SHA) && \
+		docker push $(REGISTRY_LOCAL)/devcontainers/$@ && \
 		docker push $(REGISTRY)/devcontainers/$@:$(GIT_SHA) && \
 		popd
 
 # 伪目标声明
-.PHONY: all parallel clean $(SUBDIRS)
+.PHONY: all $(SUBDIRS)