From 9f0b64527ef8dd0629c19ab7de0b6b2834eb73bd Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 24 Jul 2026 21:27:15 +0900
Subject: [PATCH] Using wildcards to search jar files instead of scan directory

---
 Dockerfiles/java-gateway/centos/Dockerfile |  1 -
 Dockerfiles/java-gateway/ol/Dockerfile     |  1 -
 Dockerfiles/java-gateway/rhel/Dockerfile   |  1 -
 templates/entrypoints/java-gateway.sh      | 18 ++----------------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile
index 2663f992..7490d73c 100644
--- a/Dockerfiles/java-gateway/centos/Dockerfile
+++ b/Dockerfiles/java-gateway/centos/Dockerfile
@@ -37,7 +37,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
     set -eux && \
     INSTALL_PKGS="bash \
-            findutils \
             shadow-utils \
             java-21-openjdk-headless" && \
     microdnf -y install \
diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile
index 33b4df10..6b963c0b 100644
--- a/Dockerfiles/java-gateway/ol/Dockerfile
+++ b/Dockerfiles/java-gateway/ol/Dockerfile
@@ -37,7 +37,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
     set -eux && \
     INSTALL_PKGS="bash \
-            findutils \
             java-21-openjdk-headless" && \
     microdnf -y install \
             --disablerepo="*" \
diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile
index fe899e67..17b8743f 100644
--- a/Dockerfiles/java-gateway/rhel/Dockerfile
+++ b/Dockerfiles/java-gateway/rhel/Dockerfile
@@ -56,7 +56,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     --mount=type=tmpfs,target=/var/cache/yum/ \
     set -eux && \
     INSTALL_PKGS="bash \
-            findutils \
             shadow-utils \
             java-21-openjdk-headless" && \
     microdnf -y install \
diff --git a/templates/entrypoints/java-gateway.sh b/templates/entrypoints/java-gateway.sh
index 805dd1c0..97a51de3 100644
--- a/templates/entrypoints/java-gateway.sh
+++ b/templates/entrypoints/java-gateway.sh
@@ -9,18 +9,7 @@ source "${ENTRYPOINT_LIBS}/logging.sh"
 : "${JAVA:=/usr/bin/java}"
 readonly ZBX_GATEWAY_CONFIG="${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml"
 readonly ZABBIX_JAVA_DIR="/usr/sbin/zabbix_java"
-
-build_classpath() {
-    local classpath
-    local jar
-    classpath="lib"
-
-    while IFS= read -r -d '' jar; do
-        classpath="${classpath}:$jar"
-    done < <(find lib bin ext_lib -name '*.jar' -print0)
-
-    printf '%s\n' "$classpath"
-}
+readonly JAVA_CLASSPATH="lib/*:bin/*:ext_lib/*"
 
 run_service() {
     info "** Preparing Zabbix Java Gateway"
@@ -31,9 +20,6 @@ run_service() {
 
     cd "$ZABBIX_JAVA_DIR"
 
-    local classpath
-    classpath="$(build_classpath)"
-
     local -a java_opts=(
         -server
         "-Dlogback.configurationFile=${ZBX_GATEWAY_CONFIG}"
@@ -57,7 +43,7 @@ run_service() {
     local -a cmd=(
         "$JAVA"
         "${java_opts[@]}"
-        -classpath "$classpath"
+        -classpath "$JAVA_CLASSPATH"
         "${zabbix_opts[@]}"
         com.zabbix.gateway.JavaGateway
     )