Skip to content

Commit

Permalink
Merge pull request justb4#14 from zhangsean/patch-1
Browse files Browse the repository at this point in the history
Update jmeter version to 5.1.1
  • Loading branch information
justb4 authored Mar 16, 2019
2 parents fd62a6e + 0a1f959 commit aeab88b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM alpine:3.9

MAINTAINER Just van den Broecke<[email protected]>

ARG JMETER_VERSION="5.1"
ARG JMETER_VERSION="5.1.1"
ENV JMETER_HOME /opt/apache-jmeter-${JMETER_VERSION}
ENV JMETER_BIN ${JMETER_HOME}/bin
ENV JMETER_DOWNLOAD_URL https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-${JMETER_VERSION}.tgz
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ See end of this doc for more detailed build/run/test instructions (thanks to @wi

Build argumments (see [build.sh](build.sh)) with default values if not passed to build:

- **JMETER_VERSION** - JMeter version, default ``5.1``
- **JMETER_VERSION** - JMeter version, default ``5.1.1``
- **IMAGE_TIMEZONE** - timezone of Docker image, default ``"Europe/Amsterdam"``

NB **IMAGE_TIMEZONE** setting is not working yet.
Expand Down Expand Up @@ -69,7 +69,7 @@ Contribution by @wilsonmar

The last line in the response should be:

<tt>Successfully tagged justb4/jmeter:5.1</tt>
<tt>Successfully tagged justb4/jmeter:5.1.1</tt>

1. Run the test script:

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

JMETER_VERSION="5.1"
JMETER_VERSION="5.1.1"

# Example build line
# --build-arg IMAGE_TIMEZONE="Europe/Amsterdam"
Expand Down
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Run JMeter Docker image with options

NAME="jmeter"
IMAGE="justb4/jmeter:5.1"
IMAGE="justb4/jmeter:5.1.1"

# Finally run
sudo docker stop ${NAME} > /dev/null 2>&1
Expand Down

0 comments on commit aeab88b

Please sign in to comment.