From e49f2896959212d994de3de36d323cedfb725d4a Mon Sep 17 00:00:00 2001
From: wangbin <wangbin@anji-plus.com>
Date: Mon, 30 Dec 2024 14:46:24 +0800
Subject: [PATCH] update docker build

---
 doc/docker/Dockerfile => Dockerfile              |  4 ++--
 build.sh                                         | 16 ++++++++++------
 .../docker-compose.yml => docker-compose.yml     |  0
 3 files changed, 12 insertions(+), 8 deletions(-)
 rename doc/docker/Dockerfile => Dockerfile (65%)
 rename doc/docker/docker-compose.yml => docker-compose.yml (100%)

diff --git a/doc/docker/Dockerfile b/Dockerfile
similarity index 65%
rename from doc/docker/Dockerfile
rename to Dockerfile
index a4e1e7b0..de9a2ef1 100644
--- a/doc/docker/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM eclipse-temurin:8-jre
 RUN mkdir -p /opt/aj-report/logs
 
 WORKDIR /opt/aj-report
-
-COPY ../../build/aj-report-1.3.0.RELEASE /opt/aj-report
+unzip build/aj-report-*.zip ./build
+COPY build/aj-report-1.3.0.RELEASE /opt/aj-report
 
 CMD /opt/aj-report/bin/start.sh && tail -f /opt/aj-report/logs/aj-report.log
diff --git a/build.sh b/build.sh
index 67299647..518a50a3 100644
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,9 @@ echo "build web"
 cd $BuildDir/report-ui
 echo "npm install"
 npm install
+if [ $? -ne 0 ]; then
+  npm install --registry=https://mirrors.cloud.tencent.com/npm/
+fi
 echo "cp echarts map js"
 cp -r node_modules_echarts_need/* node_modules/echarts/
 echo "npm run build"
@@ -19,16 +22,17 @@ npm run build:prod
 echo "publish web to springboot src/main/resources/static"
 rm -rf $BuildDir/report-core/src/main/resources/static
 mkdir -p $BuildDir/report-core/src/main/resources/static
-mv $BuildDir/report-ui/dist/* $BuildDir/report-core/src/main/resources/static/
+if [ ! -e "$BuildDir/report-ui/dist" ];then
+  echo "no build dist exist,web-build-failed"
+  exit 1
+fi
 
 echo ""
+cp $BuildDir/report-ui/dist/* $BuildDir/report-core/src/main/resources/static/
 echo "build springboot"
 cd $BuildDir/report-core
-echo "mvn clean"
-mvn clean
-echo ""
-echo "mvn package"
-mvn package -Dmaven.test.skip=true
+echo "mvn clean package"
+mvn clean package -Dmaven.test.skip=true
 
 echo "zip finish in build dir"
 if [ ! -d "$BuildDir/build" ]; then
diff --git a/doc/docker/docker-compose.yml b/docker-compose.yml
similarity index 100%
rename from doc/docker/docker-compose.yml
rename to docker-compose.yml