Merge PR #64 from typekpb/jmeter_5.5 - upgrade to 5.5

JMeter updated to version: 5.5

Author: justb4

.github/workflows/docker.yml

@@ -34,7 +34,7 @@ jobs:
         id: prep
         run: |
           DOCKER_IMAGE=justb4/jmeter
-          VERSION="5.4"
+          VERSION="5.5"
           TAGS="${DOCKER_IMAGE}:${VERSION}"
           echo ::set-output name=image::${DOCKER_IMAGE}
           echo ::set-output name=version::${VERSION}

Dockerfile

@@ -4,7 +4,7 @@ FROM alpine:3.12
 
 MAINTAINER Just van den Broecke<[email protected]>
 
-ARG JMETER_VERSION="5.4.3"
+ARG JMETER_VERSION="5.5"
 ENV JMETER_HOME /opt/apache-jmeter-${JMETER_VERSION}
 ENV JMETER_CUSTOM_PLUGINS_FOLDER /plugins
 ENV	JMETER_BIN	${JMETER_HOME}/bin

Makefile

@@ -2,7 +2,7 @@ TARGET_HOST ?= "example.com"
 TARGET_PORT ?= "80"
 THREADS ?= "1"
 CONTAINER_NAME ?= "docker-jmeter"
-IMAGE = "justb4/jmeter:5.4"
+IMAGE = "justb4/jmeter:5.5"
 TEST ?= trivial
 JVM_ARGS ?= "-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m"
 TARGET_PATH ?= "/index.html"

README.md

@@ -5,9 +5,9 @@
 ## Image on Docker Hub
 
 Docker image for [Apache JMeter](http://jmeter.apache.org).
-This Docker image can be run as the ``jmeter`` command. 
+This Docker image can be run as the ``jmeter`` command.
 Find Images of this repo on [Docker Hub](https://hub.docker.com/r/justb4/jmeter).
-Starting version 5.4 Docker builds/pushes 
+Starting version 5.4 Docker builds/pushes
 are [executed via GitHub Workflows](.github/workflows/docker.yml).
 
 ## Donate
@@ -18,15 +18,15 @@ To support its active maintainance consider making a donation, for example via P
 
 
 ## Security Patches
-As you may have seen in the news, a new zero-day exploit has been reported against the 
-popular Log4J2 library which can allow an attacker to remotely execute code. 
-The vulnerability has been reported with [CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228) 
+As you may have seen in the news, a new zero-day exploit has been reported against the
+popular Log4J2 library which can allow an attacker to remotely execute code.
+The vulnerability has been reported with [CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228)
 against the log4j-core jar and has been fixed in Log4J v2.16.0.
 
 JMeter, at least in versions 5 and later uses the vulnerable Log4J versions.
 The good news though is that the vulnerability applies only to remotely accessible Java web-services.
-JMeter is a commandline/GUI tool one runs internally. Still it is good practice to 
-patch this problem. 
+JMeter is a commandline/GUI tool one runs internally. Still it is good practice to
+patch this problem.
 
 **JMeter has been updated to 5.4.2 for security CVE-2021-45046 & CVE-2021-45046**.
 
@@ -64,7 +64,7 @@ This is a standard facility of JMeter: settings in a JMX test script
 may be defined symbolically and substituted at runtime via the commandline.
 These are called JMeter User Defined Variables or UDVs.
 
-See [test.sh](test.sh) and the [trivial test plan](tests/trivial/test-plan.jmx) for an example of UDVs passed to the Docker 
+See [test.sh](test.sh) and the [trivial test plan](tests/trivial/test-plan.jmx) for an example of UDVs passed to the Docker
 image via [run.sh](run.sh).
 
 See also: https://www.novatec-gmbh.de/en/blog/how-to-pass-command-line-properties-to-a-jmeter-testplan/
@@ -83,8 +83,8 @@ All three use values in Megabyte range.
 
 ## Installing JMeter plugins
 
-To run the container with custom JMeter plugins installed you need to mount a volume /plugins with the .jar files. For example: 
-```sh 
+To run the container with custom JMeter plugins installed you need to mount a volume /plugins with the .jar files. For example:
+```sh
 sudo docker run --name ${NAME} -i -v ${LOCAL_PLUGINS_FOLDER}:/plugins -v ${LOCAL_JMX_WORK_DIR}:${CONTAINER_JMX_WORK_DIR} -w ${PWD} ${IMAGE} $@
 ```
 
@@ -116,15 +116,15 @@ Contribution by @wilsonmar
    ./build.sh
    ```
 
-   If you view this file, the <strong>docker build</strong> command within the script is for a specific version of JMeter and implements the <strong>Dockerfile</strong> in the same folder. 
-   
+   If you view this file, the <strong>docker build</strong> command within the script is for a specific version of JMeter and implements the <strong>Dockerfile</strong> in the same folder.
+
    If you view the Dockerfile, notice the `JMETER_VERSION` specified is the same as the one in the build.sh script. The FROM keyword specifies the Alpine operating system, which is very small (less of an attack surface). Also, no JMeter plug-ins are used.
-   
+
    At the bottom of the Dockerfile is the <strong>entrypoint.sh</strong> file. If you view it, that's where JVM memory settings are specified for <strong>jmeter</strong> before it is invoked. PROTIP: Such settings need to be adjusted for tests of more complexity.
 
    The last line in the response should be:
-   
-   <tt>Successfully tagged justb4/jmeter:5.4</tt>
+
+   <tt>Successfully tagged justb4/jmeter:5.5</tt>
 
 1. Run the test script:
 
@@ -133,7 +133,7 @@ Contribution by @wilsonmar
    ```
 
    If you view the script, note it invokes the <strong>run.sh</strong> script file stored at the repo's root. View that file to see that it specifies docker image commands.
-   
+
    File and folder names specified in the test.sh script is reflected in the last line in the response for its run:
 
    <pre>
@@ -151,24 +151,24 @@ Contribution by @wilsonmar
    THREADS=10 \
    TEST=trivial \
    make
-   ```   
+   ```
 
 1. Switch to your machine's Folder program and navigate to the folder containing files which replaces files cloned in from GitHub:
-   
+
    ```
    cd tests/trivial
    ```
-   
+
    The files are:
-   
+
    * jmeter.log
    * reports folder (see below)
    * test-plan.jmx containing the JMeter test plan.
    * test-plan.jtl containing statistics from the run displayed by the index.html file.
-   
-   
+
+
 1. Navigate into the <strong>report</strong> folder and open the <strong>index.html</strong> file to pop up a browser window displaying the run report. On a Mac Terminal:
-   
+
    ```
    cd report
    open index.html
@@ -181,13 +181,13 @@ Contribution by @wilsonmar
 
 ## Specifics
 
-The Docker image built from the 
+The Docker image built from the
 [Dockerfile](Dockerfile) inherits from the [Alpine Linux](https://www.alpinelinux.org) distribution:
 
-> "Alpine Linux is built around musl libc and busybox. This makes it smaller 
-> and more resource efficient than traditional GNU/Linux distributions. 
-> A container requires no more than 8 MB and a minimal installation to disk 
-> requires around 130 MB of storage. 
+> "Alpine Linux is built around musl libc and busybox. This makes it smaller
+> and more resource efficient than traditional GNU/Linux distributions.
+> A container requires no more than 8 MB and a minimal installation to disk
+> requires around 130 MB of storage.
 > Not only do you get a fully-fledged Linux environment but a large selection of packages from the repository."
 
 See https://hub.docker.com/_/alpine/ for Alpine Docker images.

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-JMETER_VERSION=${JMETER_VERSION:-"5.4"}
+JMETER_VERSION=${JMETER_VERSION:-"5.5"}
 IMAGE_TIMEZONE=${IMAGE_TIMEZONE:-"Europe/Amsterdam"}
 
 # Example build line