From 7767d84fdc31b926d05956ef0ed609f3302745a1 Mon Sep 17 00:00:00 2001 From: D032297 Date: Mon, 31 Mar 2025 17:00:16 +0200 Subject: [PATCH 1/5] Updated README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c3addedd3..99f2b864c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -# OpenMessaging Benchmark Framework +# Fork of the OpenMessaging Benchmark Framework that uses sapmachine 17 docker image + +This fork is used to update the outdated offical docker hub image openmessaging/openmessaging-benchmark with sapmachine:17. +Find more in [./docker/README.md](./docker/README.md). [![Build](https://github.com/openmessaging/benchmark/actions/workflows/pr-build-and-test.yml/badge.svg)](https://github.com/openmessaging/benchmark/actions/workflows/pr-build-and-test.yml) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) @@ -27,7 +30,7 @@ This repository houses user-friendly, cloud-ready benchmarking suites for the fo Requirements: -* JDK 8 +* JDK 17 * Maven 3.8.6+ Common build actions: From 8fa8b2c9f29e6977a2bfd790872a9ffcd197a1fc Mon Sep 17 00:00:00 2001 From: D032297 Date: Mon, 31 Mar 2025 17:06:51 +0200 Subject: [PATCH 2/5] Squash merge feature/update-docker-image into master --- docker/Dockerfile | 2 +- docker/Dockerfile.build | 6 +++--- docker/README.md | 13 ++++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 44f77bed4..cda093166 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ # limitations under the License. # -FROM openjdk:8-jdk +FROM sapmachine:17 ARG BENCHMARK_TARBALL diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 35307f8c9..e60419e8e 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -13,14 +13,14 @@ # # Build the Project -FROM maven:latest as build +FROM maven:3.9.9-sapmachine-17 as build COPY . /benchmark WORKDIR /benchmark RUN mvn install # Create the benchmark image -FROM openjdk:8-jdk +FROM sapmachine:17 COPY --from=build /benchmark/package/target/openmessaging-benchmark-*-SNAPSHOT-bin.tar.gz / RUN mkdir /benchmark && tar -xzf openmessaging-benchmark-*-SNAPSHOT-bin.tar.gz -C /benchmark --strip=1 RUN rm /openmessaging-benchmark-*-SNAPSHOT-bin.tar.gz -WORKDIR /benchmark \ No newline at end of file +WORKDIR /benchmark diff --git a/docker/README.md b/docker/README.md index a58ef527c..8aa628bd0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,10 +1,17 @@ # OpenMessaging Benchmark Framework Docker +## Precondition + +You need to install [sapmachine 17](https://sapmachine.io/) +and set the JAVA_HOME environment variable to its installation directory. + +## Building the image + You can use either of the Dockerfiles - `./docker/Dockerfile` or `./docker/Dockerfile.build` based on your needs. ### `Dockerfile` -Uses `openjdk-8` and takes `BENCHMARK_TARBALL` as an argument. +Uses `sapmachine:17` and takes `BENCHMARK_TARBALL` as an argument. While using this Dockerfile, you will need to build the project locally **first**. ``` @@ -15,8 +22,8 @@ While using this Dockerfile, you will need to build the project locally **first* ### `Dockerfile.build` -Uses the latest version of `maven` in order to build the project, and then use `openjdk-8` as runtime. -This Dockerfile has no dependency (you do not need Mavent to be installed locally). +Uses the latest version of `maven` in order to build the project, and then use `sapmachine:17` as runtime. +This Dockerfile has no dependency (you do not need Maven to be installed locally). ``` #> docker build . -f docker/Dockerfile.build From fe9e3b1a468cc44cea7026f1877d3d86e501cccd Mon Sep 17 00:00:00 2001 From: D032297 Date: Wed, 23 Apr 2025 15:23:12 +0200 Subject: [PATCH 3/5] Install vim on the openmessaging image --- docker/Dockerfile | 5 +++++ docker/Dockerfile.build | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index cda093166..6fd2268c0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,8 +16,13 @@ FROM sapmachine:17 ARG BENCHMARK_TARBALL +# Using ADD instead of COPY because ${BENCHMARK_TARBALL} is an archive that needs to be extracted ADD ${BENCHMARK_TARBALL} / RUN mv openmessaging-benchmark-* /benchmark WORKDIR /benchmark + +# Install vim +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y vim=2:9.1.0016-1ubuntu7.8 tzdata=2025b-0ubuntu0.24.04 && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index e60419e8e..cbc360fce 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -24,3 +24,7 @@ COPY --from=build /benchmark/package/target/openmessaging-benchmark-*-SNAPSHOT-b RUN mkdir /benchmark && tar -xzf openmessaging-benchmark-*-SNAPSHOT-bin.tar.gz -C /benchmark --strip=1 RUN rm /openmessaging-benchmark-*-SNAPSHOT-bin.tar.gz WORKDIR /benchmark + +# Install vim +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y vim=2:9.1.0016-1ubuntu7.8 tzdata=2025b-0ubuntu0.24.04 && rm -rf /var/lib/apt/lists/* From c693e276d33b6d932fc494db5c0dfe363583cd6d Mon Sep 17 00:00:00 2001 From: D032297 Date: Thu, 24 Apr 2025 11:27:04 +0200 Subject: [PATCH 4/5] Start shell by default --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6fd2268c0..1cfb788bf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,3 +26,6 @@ WORKDIR /benchmark # Install vim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y vim=2:9.1.0016-1ubuntu7.8 tzdata=2025b-0ubuntu0.24.04 && rm -rf /var/lib/apt/lists/* + +# Start a shell by default +CMD ["/bin/bash"] From cd059ee7c2411c3eaf0dcf57ae923031a4da3421 Mon Sep 17 00:00:00 2001 From: D032297 Date: Thu, 24 Apr 2025 11:31:39 +0200 Subject: [PATCH 5/5] Start shell by default also for Dockerfile.build --- docker/Dockerfile.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index cbc360fce..1c9636a85 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -28,3 +28,6 @@ WORKDIR /benchmark # Install vim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y vim=2:9.1.0016-1ubuntu7.8 tzdata=2025b-0ubuntu0.24.04 && rm -rf /var/lib/apt/lists/* + +# Start a shell by default +CMD ["/bin/bash"]