Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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<[email protected]>

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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Contribution by @wilsonmar

The last line in the response should be:

<tt>Successfully tagged justb4/jmeter:5.5</tt>
<tt>Successfully tagged justb4/jmeter:5.6.2</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=${JMETER_VERSION:-"5.5"}
JMETER_VERSION=${JMETER_VERSION:-"5.6.2"}
IMAGE_TIMEZONE=${IMAGE_TIMEZONE:-"Europe/Amsterdam"}

# Example build line
Expand Down