Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Fix Java Gateway build. Use read only mode for Java Gateway

Browse source
This commit is contained in:
Alexey Pustovalov 2026-07-24 21:18:09 +09:00
parent de2f409ea1
commit 1c41fa6d97
16 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfiles/build-mysql/alpine/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-mysql/centos/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-mysql/ol/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-mysql/rhel/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-mysql/ubuntu/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-pgsql/alpine/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-pgsql/centos/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-pgsql/ol/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-pgsql/ubuntu/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-sqlite3/alpine/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-sqlite3/centos/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-sqlite3/ol/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-sqlite3/rhel/Dockerfile
View file

@ -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 \

3
Dockerfiles/build-sqlite3/ubuntu/Dockerfile
View file

@ -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 \

1
compose_zabbix_components.yaml
View file

@ -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:

1
templates/entrypoints/java-gateway.sh
View file

@ -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}")