test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: 多架构镜像构建 (#10690) 

* build: 多架构镜像构建

* build: 多架构镜像构建

* build: 多架构镜像构建

Co-authored-by: CaptainB <bin@fit2cloud.com>
This commit is contained in:
metersphere-bot 2022-02-17 18:02:21 +08:00 committed by GitHub
parent ef029dd23a
commit fc6c2e9e7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-push.yml vendored
View File

@ -51,7 +51,7 @@ jobs:
run: mvn -B package --file pom.xml run: mvn -B package --file pom.xml
- name: Unzip jar - 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 - name: Prepare
id: prepare id: prepare

4
Dockerfile
View File

@ -9,10 +9,10 @@ COPY ${DEPENDENCY}/BOOT-INF/lib /opt/lib
COPY ${DEPENDENCY}/META-INF /opt/META-INF COPY ${DEPENDENCY}/META-INF /opt/META-INF
COPY ${DEPENDENCY}/BOOT-INF/classes /opt 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 JAVA_MAIN_CLASS=io.metersphere.Application
ENV AB_OFF=true ENV AB_OFF=true
ENV MS_VERSION=${MS_VERSION} ENV MS_VERSION=${MS_VERSION}
ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Djava.awt.headless=true" 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"]

2
Jenkinsfile vendored
View File

@ -17,7 +17,7 @@ pipeline {
// sh "yarn install" // sh "yarn install"
// sh "cd .." // sh "cd .."
sh "./mvnw clean package --settings ./settings.xml" 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"
} }
} }
} }