From 23649570363beb960e6802faec8a148041131c23 Mon Sep 17 00:00:00 2001
From: Wang Yan <wangyan@vmware.com>
Date: Wed, 15 Jan 2025 11:41:15 +0800
Subject: [PATCH] update spectral image (#21410)

Signed-off-by: wang yan <wangyan@vmware.com>
---
 Makefile                      | 7 ++++---
 make/photon/Makefile          | 2 +-
 make/photon/portal/Dockerfile | 3 ++-
 tools/spectral/Dockerfile     | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 0dd0d18d9f3..0ecb98a5c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,7 @@ PREPARE_VERSION_NAME=versions
 REGISTRYVERSION=v2.8.3-patch-redis
 TRIVYVERSION=v0.56.1
 TRIVYADAPTERVERSION=v0.32.0-rc.1
+NODEBUILDIMAGE=node:16.18.0
 
 # version of registry for pulling the source code
 REGISTRY_SRC_TAG=v2.8.3
@@ -282,8 +283,8 @@ endef
 
 # lint swagger doc
 SPECTRAL_IMAGENAME=$(IMAGENAMESPACE)/spectral
-SPECTRAL_VERSION=v6.11.1
-SPECTRAL_IMAGE_BUILD_CMD=${DOCKERBUILD} -f ${TOOLSPATH}/spectral/Dockerfile --build-arg GOLANG=${GOBUILDIMAGE} --build-arg SPECTRAL_VERSION=${SPECTRAL_VERSION} -t ${SPECTRAL_IMAGENAME}:$(SPECTRAL_VERSION) .
+SPECTRAL_VERSION=v6.14.2
+SPECTRAL_IMAGE_BUILD_CMD=${DOCKERBUILD} -f ${TOOLSPATH}/spectral/Dockerfile --build-arg NODE=${NODEBUILDIMAGE} --build-arg SPECTRAL_VERSION=${SPECTRAL_VERSION} -t ${SPECTRAL_IMAGENAME}:$(SPECTRAL_VERSION) .
 SPECTRAL=$(RUNCONTAINER) $(SPECTRAL_IMAGENAME):$(SPECTRAL_VERSION)
 
 lint_apis:
@@ -387,7 +388,7 @@ build:
 		echo Should pull base images from registry in docker configuration since no base images built. ; \
 		exit 1; \
 	fi
-	make -f $(MAKEFILEPATH_PHOTON)/Makefile $(BUILDTARGET) -e DEVFLAG=$(DEVFLAG) -e GOBUILDIMAGE=$(GOBUILDIMAGE) \
+	make -f $(MAKEFILEPATH_PHOTON)/Makefile $(BUILDTARGET) -e DEVFLAG=$(DEVFLAG) -e GOBUILDIMAGE=$(GOBUILDIMAGE) -e NODEBUILDIMAGE=$(NODEBUILDIMAGE) \
 	 -e REGISTRYVERSION=$(REGISTRYVERSION) -e REGISTRY_SRC_TAG=$(REGISTRY_SRC_TAG)  -e DISTRIBUTION_SRC=$(DISTRIBUTION_SRC)\
 	 -e TRIVYVERSION=$(TRIVYVERSION) -e TRIVYADAPTERVERSION=$(TRIVYADAPTERVERSION) \
 	 -e VERSIONTAG=$(VERSIONTAG) \
diff --git a/make/photon/Makefile b/make/photon/Makefile
index a8f2787d9e4..44a75255cdd 100644
--- a/make/photon/Makefile
+++ b/make/photon/Makefile
@@ -122,7 +122,7 @@ _build_db:
 _build_portal:
 	@$(call _build_base,$(PORTAL),$(DOCKERFILEPATH_PORTAL))
 	@echo "building portal container for photon..."
-	$(DOCKERBUILD_WITH_PULL_PARA) --build-arg harbor_base_image_version=$(BASEIMAGETAG) --build-arg harbor_base_namespace=$(BASEIMAGENAMESPACE) --build-arg npm_registry=$(NPM_REGISTRY) -f $(DOCKERFILEPATH_PORTAL)/$(DOCKERFILENAME_PORTAL) -t $(DOCKERIMAGENAME_PORTAL):$(VERSIONTAG) .
+	$(DOCKERBUILD_WITH_PULL_PARA) --build-arg harbor_base_image_version=$(BASEIMAGETAG) --build-arg harbor_base_namespace=$(BASEIMAGENAMESPACE) --build-arg NODE=${NODEBUILDIMAGE} --build-arg npm_registry=$(NPM_REGISTRY) -f $(DOCKERFILEPATH_PORTAL)/$(DOCKERFILENAME_PORTAL) -t $(DOCKERIMAGENAME_PORTAL):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_core:
diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile
index e0540cbef46..9be6771c79a 100644
--- a/make/photon/portal/Dockerfile
+++ b/make/photon/portal/Dockerfile
@@ -1,6 +1,7 @@
 ARG harbor_base_image_version
 ARG harbor_base_namespace
-FROM node:16.18.0 as nodeportal
+ARG NODE
+FROM ${NODE} as nodeportal
 
 WORKDIR /build_dir
 
diff --git a/tools/spectral/Dockerfile b/tools/spectral/Dockerfile
index 0a93965a317..012bce1cbda 100644
--- a/tools/spectral/Dockerfile
+++ b/tools/spectral/Dockerfile
@@ -1,5 +1,5 @@
-ARG GOLANG
-FROM ${GOLANG}
+ARG NODE
+FROM ${NODE}
 
 ARG SPECTRAL_VERSION
 RUN case "$(dpkg --print-architecture)" in \