diff --git a/Dockerfile b/Dockerfile index 394daef4f3..2c3bac0f96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,18 @@ COPY ${DEPENDENCY}/BOOT-INF/lib /opt/lib COPY ${DEPENDENCY}/META-INF /opt/META-INF COPY ${DEPENDENCY}/BOOT-INF/classes /opt +# 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 ENV AB_OFF=true 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) ''' } diff --git a/backend/pom.xml b/backend/pom.xml index 315e3d0ead..4a78fe49a1 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -475,38 +475,6 @@ 2.6 - - org.apache.maven.plugins - maven-antrun-plugin - - - main-class-placement - generate-resources - - - - - - - - - - - - - - - - - - - - - run - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/frontend/pom.xml b/frontend/pom.xml index 8f26defe34..588e60063d 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -65,6 +65,20 @@ + + maven-clean-plugin + + + + dist + + ** + + false + + + +