Merge remote-tracking branch 'origin/dev' into dev

2020-05-09 16:51:56 +08:00 · 2020-05-09 16:51:56 +08:00 · c62bf4c960
parent 2a686f5133 4131aac4a1
commit c62bf4c960
2 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -6,10 +6,6 @@ RUN mkdir -p /opt/apps

 ADD backend/target/backend-1.0.jar /opt/apps

-ADD backend/class/jmeter/apache-jmeter-5.2.1.zip /opt/jmeter
-
-RUN rm -rf /opt/jmeter && unzip -o apache-jmeter-5.2.1.zip && rm -rf /opt/jmeter/apache-jmeter-5.2.1.zip
-
 ENV JAVA_APP_JAR=/opt/apps/backend-1.0.jar

 ENV AB_OFF=true
--- a/backend/src/main/resources/jmeter/apache-jmeter-5.2.1.zip
+++ b/backend/src/main/resources/jmeter/apache-jmeter-5.2.1.zip