From fc6c2e9e7cf99f928cf9aed586582883d52ce430 Mon Sep 17 00:00:00 2001 From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com> Date: Thu, 17 Feb 2022 18:02:21 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E5=A4=9A=E6=9E=B6=E6=9E=84=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=9E=84=E5=BB=BA=20(#10690)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: 多架构镜像构建 * build: 多架构镜像构建 * build: 多架构镜像构建 Co-authored-by: CaptainB --- .github/workflows/build-push.yml | 2 +- Dockerfile | 4 ++-- Jenkinsfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 2eca08df4f..a743d7e79b 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -51,7 +51,7 @@ jobs: run: mvn -B package --file pom.xml - name: Unzip jar - run: mkdir -p backend/target/dependency && (cd backend/target/dependency; jar -xf ../*.jar) + run: mkdir -p backend/target/dependency && (cd backend/target/dependency; jar -xf ../*.jar) && mkdir -p backend/target/dependency/BOOT-INF/classes/jmeter/lib/junit - name: Prepare id: prepare diff --git a/Dockerfile b/Dockerfile index 440f7c8a60..93f5fd1457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,10 @@ COPY ${DEPENDENCY}/BOOT-INF/lib /opt/lib COPY ${DEPENDENCY}/META-INF /opt/META-INF COPY ${DEPENDENCY}/BOOT-INF/classes /opt -ENV JAVA_CLASSPATH=/opt:/opt/lib/ms-jmeter-core-*.jar:/opt/lib/* +ENV JAVA_CLASSPATH=/opt:/opt/lib/ms-jmeter-core.jar:/opt/lib/* ENV JAVA_MAIN_CLASS=io.metersphere.Application ENV AB_OFF=true ENV MS_VERSION=${MS_VERSION} ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true" -CMD ["/deployments/run-java.sh"] +CMD ["sh", "-c", "mv /opt/lib/ms-jmeter-core-*.jar /opt/lib/ms-jmeter-core.jar && /deployments/run-java.sh"] diff --git a/Jenkinsfile b/Jenkinsfile index e9fda0ea09..a96b5589dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { // sh "yarn install" // sh "cd .." sh "./mvnw clean package --settings ./settings.xml" - sh "mkdir -p backend/target/dependency && (cd backend/target/dependency; jar -xf ../*.jar)" + sh "mkdir -p backend/target/dependency && (cd backend/target/dependency; jar -xf ../*.jar) && mkdir -p backend/target/dependency/BOOT-INF/classes/jmeter/lib/junit" } } }