From ef3f2618ddab957236da1c20cfa9820fdb409364 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 20 Apr 2022 18:35:25 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E4=BD=BF=E7=94=A8mvnd=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E6=9E=84=E5=BB=BA=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 14 +++++++++++--- Jenkinsfile | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 195ecd99d7..2c3bac0f96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,17 @@ COPY ${DEPENDENCY}/BOOT-INF/lib /opt/lib COPY ${DEPENDENCY}/META-INF /opt/META-INF COPY ${DEPENDENCY}/BOOT-INF/classes /opt -ADD frontend/src/assets/theme/index.css /opt/static/css/index.css -ADD frontend/dist/*[^.html] /opt/static/ -ADD frontend/dist/*.html /opt/public/ +# html 文件 +COPY frontend/dist/*.html /opt/public/ + +# 静态文件 +COPY frontend/dist/favicon.ico /opt/static/favicon.ico +COPY frontend/dist/fonts /opt/static/fonts +COPY frontend/dist/img /opt/static/img +COPY frontend/dist/js /opt/static/js +COPY frontend/dist/css /opt/static/css +COPY frontend/dist/*.worker.js /opt/static/ +COPY frontend/src/assets/theme/index.css /opt/static/css/index.css ENV JAVA_CLASSPATH=/opt:/opt/lib/ms-jmeter-core.jar:/opt/lib/* ENV JAVA_MAIN_CLASS=io.metersphere.Application diff --git a/Jenkinsfile b/Jenkinsfile index 3a0b9097ff..6f9d2fc5f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,9 @@ pipeline { sh ''' export JAVA_HOME=/opt/jdk-11 export CLASSPATH=$JAVA_HOME/lib:$CLASSPATH - export PATH=$JAVA_HOME/bin:$PATH + export PATH=$JAVA_HOME/bin:/opt/mvnd/bin:$PATH java -version - ./mvnw clean package --settings ./settings.xml + mvnd clean package --settings ./settings.xml mkdir -p backend/target/dependency && (cd backend/target/dependency; jar -xf ../*.jar) ''' }