chore: filter out dirs without go file when compile and build images

colin404 · colin404 · commit c79511995646 · 2024-06-09T12:39:33.000+08:00
diff --git a/.todo.md b/.todo.md
@@ -36,6 +36,7 @@
 [?] 诊断平台
 [?] GraphQL API
 [?] 添加状态机
+[?] 场景：Webhook 展示修改镜像地址？？
 ---
 
 [?] 创建一个项目开发者社区网站 + 群？？？
diff --git a/build/docker/gen-docs/Dockerfile b/build/docker/gen-docs/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-docs binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/gen-docs/Dockerfile.multistage b/build/docker/gen-docs/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-docs binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/gen-man/Dockerfile b/build/docker/gen-man/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-man binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/gen-man/Dockerfile.multistage b/build/docker/gen-man/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-man binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/gen-onex-docs/Dockerfile b/build/docker/gen-onex-docs/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-onex-docs binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/gen-onex-docs/Dockerfile.multistage b/build/docker/gen-onex-docs/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-onex-docs binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/gen-onex-gorm-model/Dockerfile b/build/docker/gen-onex-gorm-model/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-onex-gorm-model binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/gen-onex-gorm-model/Dockerfile.multistage b/build/docker/gen-onex-gorm-model/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-onex-gorm-model binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/gen-yaml/Dockerfile b/build/docker/gen-yaml/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-yaml binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/gen-yaml/Dockerfile.multistage b/build/docker/gen-yaml/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-yaml binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/onex-blc/Dockerfile b/build/docker/onex-blc/Dockerfile
diff --git a/build/docker/onex-blc/Dockerfile.multistage b/build/docker/onex-blc/Dockerfile.multistage
diff --git a/build/docker/onex-chatroom/Dockerfile b/build/docker/onex-chatroom/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex-chatroom binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/onex-chatroom/Dockerfile.multistage b/build/docker/onex-chatroom/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex-chatroom binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/onex-fake-miner/Dockerfile b/build/docker/onex-fake-miner/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex-fake-miner binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is alpine:3.17
-ARG prod_image=alpine:3.17
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/onex-fake-miner/Dockerfile.multistage b/build/docker/onex-fake-miner/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex-fake-miner binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is alpine:3.17
-ARG prod_image=alpine:3.17
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/onex-oss-center/Dockerfile b/build/docker/onex-oss-center/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex-oss-center binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/onex-oss-center/Dockerfile.multistage b/build/docker/onex-oss-center/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex-oss-center binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/build/docker/onex/Dockerfile b/build/docker/onex/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<colin404@foxmail.com>"
diff --git a/build/docker/onex/Dockerfile.multistage b/build/docker/onex/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.
diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk
@@ -11,7 +11,9 @@ ifeq ($(origin GOBIN), undefined)
 	GOBIN := $(GOPATH)/bin
 endif
 
-COMMANDS ?= $(filter-out %.md, $(wildcard ${ONEX_ROOT}/cmd/*))
+CMD_DIRS := $(wildcard $(ONEX_ROOT)/cmd/*)
+# Filter out directories without Go files, as these directories cannot be compiled.
+COMMANDS := $(filter-out $(wildcard %.md), $(foreach dir, $(CMD_DIRS), $(if $(wildcard $(dir)/*.go), $(dir),)))
 BINS ?= $(foreach cmd,${COMMANDS},$(notdir ${cmd}))
 
 ifeq (${COMMANDS},)
diff --git a/scripts/make-rules/image.mk b/scripts/make-rules/image.mk
@@ -20,10 +20,10 @@ _DOCKER_BUILD_EXTRA_ARGS += $(EXTRA_ARGS)
 endif
 
 # Determine image files by looking into cmd/*
-IMAGES_DIR ?= $(wildcard ${ONEX_ROOT}/cmd/*)
-# Determine images names by stripping out the dir names
-IMAGES ?= $(filter-out tools,$(foreach image,${IMAGES_DIR},$(notdir ${image})))
-
+CMD_DIRS ?= $(wildcard ${ONEX_ROOT}/cmd/*)
+# Determine images names by stripping out the dir names.
+# Filter out directories without Go files, as these directories cannot be compiled to build a docker image.
+IMAGES ?= $(filter-out tools, $(foreach dir, $(CMD_DIRS), $(notdir $(if $(wildcard $(dir)/*.go), $(dir),))))
 ifeq (${IMAGES},)
   $(error Could not determine IMAGES, set ONEX_ROOT or run in source dir)
 endif
