From 1c41fa6d97dd252bd01c90f02ab780e3749a1b6c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 24 Jul 2026 21:18:09 +0900 Subject: [PATCH] Fix Java Gateway build. Use read only mode for Java Gateway --- Dockerfiles/build-mysql/alpine/Dockerfile | 3 ++- Dockerfiles/build-mysql/centos/Dockerfile | 3 ++- Dockerfiles/build-mysql/ol/Dockerfile | 3 ++- Dockerfiles/build-mysql/rhel/Dockerfile | 3 ++- Dockerfiles/build-mysql/ubuntu/Dockerfile | 3 ++- Dockerfiles/build-pgsql/alpine/Dockerfile | 3 ++- Dockerfiles/build-pgsql/centos/Dockerfile | 3 ++- Dockerfiles/build-pgsql/ol/Dockerfile | 3 ++- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/alpine/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/centos/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/ol/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/rhel/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 3 ++- compose_zabbix_components.yaml | 1 + templates/entrypoints/java-gateway.sh | 1 - 16 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 6ea07cc5..37a45684 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -50,7 +50,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/sbin \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 6fc6401d..0ceb8d41 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -50,7 +50,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/sbin \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index bf632f05..36b932c2 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -50,7 +50,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/sbin \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index da2450ec..b629001a 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -61,7 +61,8 @@ RUN --mount=from=sources,target=/tmp/src,z \ ${ZBX_OUTPUT_DIR}/server/sbin \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 4bbcf804..4eead9bd 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -50,7 +50,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/sbin \ ${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 7f657e01..48c958bb 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -52,7 +52,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index bb49f36b..906b3fda 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -52,7 +52,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index d3557e5f..46465daf 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -52,7 +52,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 01ebf7a3..b0581f37 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -52,7 +52,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/without-compression/ \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/conf \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 516f6a1f..681804d2 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -47,7 +47,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/sbin \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 6bd4aa94..0d1cb5d8 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -47,7 +47,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/sbin \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 02c68dfd..1ca5e6dc 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -47,7 +47,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/sbin \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index 9deea675..4834f6ac 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -58,7 +58,8 @@ RUN --mount=from=sources,target=/tmp/src,z \ ${ZBX_OUTPUT_DIR}/proxy/sbin \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index ab236c3f..bdf1c331 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -47,7 +47,8 @@ RUN --mount=from=sources,target=/tmp/src,ro \ ${ZBX_OUTPUT_DIR}/proxy/sbin \ ${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ - ${ZBX_OUTPUT_DIR}/java_gateway/sbin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin \ + ${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib \ ${ZBX_OUTPUT_DIR}/java_gateway/conf \ ${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/general/sbin \ diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index c1fcfe3c..0dc57694 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -607,6 +607,7 @@ services: protocol: tcp restart: "${RESTART_POLICY}" attach: false + read_only: true volumes: - ${DATA_DIRECTORY}/usr/sbin/zabbix_java/ext_lib:/usr/sbin/zabbix_java/ext_lib:ro deploy: diff --git a/templates/entrypoints/java-gateway.sh b/templates/entrypoints/java-gateway.sh index e07bb84c..805dd1c0 100644 --- a/templates/entrypoints/java-gateway.sh +++ b/templates/entrypoints/java-gateway.sh @@ -48,7 +48,6 @@ run_service() { "-Dsun.rmi.transport.tcp.responseTimeout=${ZBX_TIMEOUT}000" "-Dzabbix.listenPort=${ZBX_LISTEN_PORT:-10052}" "-Dzabbix.timeout=${ZBX_TIMEOUT}" - "-Dzabbix.pidFile=/tmp/java_gateway.pid" ) [[ -n "${ZBX_LISTEN_IP:-}" ]] && zabbix_opts+=("-Dzabbix.listenIP=${ZBX_LISTEN_IP}")