diff --git a/docker/jmeter-base/Dockerfile b/docker/jmeter-base/Dockerfile index 5faaa2b149..f5723be152 100644 --- a/docker/jmeter-base/Dockerfile +++ b/docker/jmeter-base/Dockerfile @@ -1,29 +1,29 @@ FROM alpine:latest LABEL maintainer="support@fit2cloud.com" -ENV JMETER_VERSION "5.2.1" - +ENV JMETER_VERSION "5.3" +ENV KAFKA_BACKEND_LISTENER_VERSION "1.0.4" #定义时区参数 ENV TZ=Asia/Shanghai RUN apk update && \ apk upgrade && \ - apk add --update openjdk8-jre wget tar bash && \ + apk add --update openjdk8 wget tar bash && \ wget https://mirrors.tuna.tsinghua.edu.cn/apache/jmeter/binaries/apache-jmeter-${JMETER_VERSION}.tgz && \ wget https://jmeter-plugins.org/files/packages/jpgc-casutg-2.9.zip && \ wget https://jmeter-plugins.org/files/packages/jpgc-tst-2.5.zip && \ - wget https://github.com/metersphere/jmeter-backend-listener-kafka/releases/download/v1.0.2/jmeter.backendlistener.kafka-1.0.2.jar && \ + wget https://github.com/metersphere/jmeter-backend-listener-kafka/releases/download/v${KAFKA_BACKEND_LISTENER_VERSION}/jmeter.backendlistener.kafka-${KAFKA_BACKEND_LISTENER_VERSION}.jar && \ wget https://github.com/metersphere/jmeter-plugins-for-apache-dubbo/releases/download/2.7.7/jmeter-plugins-dubbo-2.7.7-jar-with-dependencies.jar && \ mkdir -p /opt/jmeter && \ tar -zxf apache-jmeter-${JMETER_VERSION}.tgz -C /opt/jmeter/ --strip-components=1 && \ unzip -o jpgc-casutg-2.9.zip -d /tmp/ && mv /tmp/lib/ext/jmeter-plugins-casutg-2.9.jar /opt/jmeter/lib/ext && \ unzip -o jpgc-tst-2.5.zip -d /tmp/ && mv /tmp/lib/ext/jmeter-plugins-tst-2.5.jar /opt/jmeter/lib/ext && \ - mv jmeter.backendlistener.kafka-1.0.2.jar /opt/jmeter/lib/ext && \ + mv jmeter.backendlistener.kafka-${KAFKA_BACKEND_LISTENER_VERSION}.jar /opt/jmeter/lib/ext && \ mv jmeter-plugins-dubbo-2.7.7-jar-with-dependencies.jar /opt/jmeter/lib/ext && \ rm -rf apache-jmeter-${JMETER_VERSION}.tgz && \ rm -rf jpgc-casutg-2.9.zip && \ rm -rf jpgc-tst-2.5.zip && \ - rm -rf jmeter.backendlistener.kafka-1.0.2.jar && \ + rm -rf jmeter.backendlistener.kafka-${KAFKA_BACKEND_LISTENER_VERSION}.jar && \ rm -rf jmeter-plugins-dubbo-2.7.7-jar-with-dependencies.jar && \ rm -rf /var/cache/apk/* && \ wget -O /usr/bin/tpl https://github.com/schneidexe/tpl/releases/download/v0.5.0/tpl-linux-amd64 && \ @@ -31,7 +31,7 @@ RUN apk update && \ ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo "$TZ" > /etc/timezone ENV JMETER_HOME /opt/jmeter -ENV PATH $PATH:$JMETER_HOME/bin +ENV PATH $PATH:$JMETER_HOME/bin:/usr/lib/jvm/java-1.8-openjdk/bin ADD log4j2.xml $JMETER_HOME/bin/log4j2.xml ADD jmeter.properties $JMETER_HOME/bin/jmeter.properties \ No newline at end of file diff --git a/docker/jmeter-master/Dockerfile b/docker/jmeter-master/Dockerfile index d88bbbba44..372f8784d9 100644 --- a/docker/jmeter-master/Dockerfile +++ b/docker/jmeter-master/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fit2cloud.com/metersphere/jmeter-base:latest +FROM registry.fit2cloud.com/metersphere/jmeter-base:0.0.1 LABEL maintainer="support@fit2cloud.com" EXPOSE 60000