Merge branch 'develop'

.gitlab-ci.yml

@@ -93,3 +93,4 @@ kustomize_set_image_prod:
     - git remote set-url origin "$GITLAB_URL"
     - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
     - git push --set-upstream origin master  #重新提交修改镜像版本后的代码
+

Dockerfile

-FROM node:alpine as builder
+FROM node:18-alpine as builder
 ARG PROFILES_ACTIVE
 ENV PROFILES_ACTIVE=$PROFILES_ACTIVE
 WORKDIR /app
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
 RUN \
-  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
-  elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
+  if [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
+  elif [ -f yarn.lock ]; then yarn --frozen-lockfile; \
   elif [ -f package-lock.json ]; then npm ci; \
   else echo "Lockfile not found." && exit 1; \
   fi