diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3a4480f..7e28aa8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,7 +34,7 @@ jobs: id: prep run: | DOCKER_IMAGE=justb4/jmeter - VERSION="5.5" + VERSION="5.6.2" TAGS="${DOCKER_IMAGE}:${VERSION}" echo ::set-output name=image::${DOCKER_IMAGE} echo ::set-output name=version::${VERSION} diff --git a/Dockerfile b/Dockerfile index daf1182..8536a9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ # inspired by https://github.com/hauptmedia/docker-jmeter and # https://github.com/hhcordero/docker-jmeter-server/blob/master/Dockerfile -FROM alpine:3.12 +FROM alpine:3.18 MAINTAINER Just van den Broecke -ARG JMETER_VERSION="5.5" +ARG JMETER_VERSION="5.6.2" ENV JMETER_HOME /opt/apache-jmeter-${JMETER_VERSION} ENV JMETER_CUSTOM_PLUGINS_FOLDER /plugins ENV JMETER_BIN ${JMETER_HOME}/bin diff --git a/Makefile b/Makefile index f627529..6bdcda3 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TARGET_HOST ?= "example.com" TARGET_PORT ?= "80" THREADS ?= "1" CONTAINER_NAME ?= "docker-jmeter" -IMAGE = "justb4/jmeter:5.5" +IMAGE = "justb4/jmeter:5.6.2" TEST ?= trivial JVM_ARGS ?= "-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m" TARGET_PATH ?= "/index.html" diff --git a/README.md b/README.md index d726c23..9903f05 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ Contribution by @wilsonmar The last line in the response should be: - Successfully tagged justb4/jmeter:5.5 + Successfully tagged justb4/jmeter:5.6.2 1. Run the test script: diff --git a/build.sh b/build.sh index 03d90ec..09b4370 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -JMETER_VERSION=${JMETER_VERSION:-"5.5"} +JMETER_VERSION=${JMETER_VERSION:-"5.6.2"} IMAGE_TIMEZONE=${IMAGE_TIMEZONE:-"Europe/Amsterdam"} # Example build line