Merge branch 'develop'

.github/workflows/develop.yml

@@ -18,6 +18,7 @@ env:
   ACR_EE_TAG: ${{ github.sha }}
   JAVA_VERSION: "8"
   GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/csf-admin.git
+  PROFILES_ACTIVE: development
 
 permissions:
   contents: read

.github/workflows/master.yml

@@ -19,6 +19,7 @@ env:
   ACR_EE_TAG: ${{ github.sha }}
   JAVA_VERSION: "8"
   GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/csf-admin.git
+  PROFILES_ACTIVE: production
 
 permissions:
   contents: read

Dockerfile

@@ -6,7 +6,10 @@ RUN npm ci
 COPY . .
 #EXPOSE 5173
 #CMD ["npm", "run", "dev"]
-RUN npm run build
+RUN \
+  if [ $PROFILES_ACTIVE='development' ]; then echo "env PROFILES_ACTIVE=development. exec npm run buildDev" && npm run buildDev; \
+  else echo "env PROFILES_ACTIVE not found. exec npm run build" && npm run build; \
+  fi
 
 # nginx
 FROM nginx:alpine as production

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 707f73770a77e69d27f12648d8fa8dee9251776e
+  newTag: ee07a5e848df6c6aa55af7b58299e5c3906d6760

package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "buildDev": "vite build --mode development",
     "build:tsc": "tsc && vite build",
     "preview": "vite preview",
     "lint": "npx eslint src",
@@ -65,4 +66,4 @@
     "vite": "^4.3.9",
     "vite-tsconfig-paths": "^3.5.0"
   }
-}
+}
\ No newline at end of file