Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/h5 into develop

.gitignore

@@ -17,10 +17,11 @@ pnpm-debug.log*
 
 # Lock files
 package-lock.json
-yarn.lock
 pnpm-lock.yaml*
 yarn-lock.yaml*
 package-lock.yaml*
+package-lock.json*
+#yarn.lock*
 
 # Editor directories and files
 .idea

Dockerfile

@@ -4,17 +4,19 @@ ENV PROFILES_ACTIVE=$PROFILES_ACTIVE
 WORKDIR /app
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
 RUN \
-  if [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
-  elif [ -f yarn.lock ]; then yarn --frozen-lockfile; \
+  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
+  elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
   elif [ -f package-lock.json ]; then npm ci; \
   else echo "Lockfile not found." && exit 1; \
   fi
 COPY . .
 
-RUN \
-  if [ "${PROFILES_ACTIVE}" = "development" ]; then echo "env PROFILES_ACTIVE=development. exec pnpm run build:h5:dev" && pnpm run build:h5:dev; \
-  else echo "env PROFILES_ACTIVE !=development. exec pnpm run build:h5" && pnpm run build:h5; \
-  fi
+# RUN \
+#  if [ "${PROFILES_ACTIVE}" = "development" ]; then echo "env PROFILES_ACTIVE=development. exec yarn run build:h5:dev" && yarn run build:h5:dev; \
+#  else echo "env PROFILES_ACTIVE !=development. exec yarn run build:h5" && yarn run build:h5; \
+#  fi
+
+RUN yarn run build:h5
 
 # nginx
 FROM nginx:alpine as production
@@ -31,4 +33,4 @@ COPY ItnIxOQr0x.txt ItnIxOQr0x.txt
 
 EXPOSE 80
 # Containers run nginx with global directives and daemon off
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+ENTRYPOINT ["nginx", "-g", "daemon off;"]