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

Fixed Java Gateway variable. ZBX_JAVA_OPTS is currently supported for additional arguments

Browse source
This commit is contained in:
Alexey Pustovalov 2026-07-24 18:44:10 +09:00
parent 135acb8b4e
commit d0c5869b9d
25 changed files with 98 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/conf \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/conf \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/conf \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -62,6 +62,7 @@ RUN --mount=from=sources,target=/tmp/src,z \
${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/conf \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -157,7 +158,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -51,6 +51,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/conf \ ${ZBX_OUTPUT_DIR}/server/conf \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -147,7 +148,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${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}/server/database/${DB_TYPE}/option-patches/without-compression/ \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${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}/server/database/${DB_TYPE}/option-patches/without-compression/ \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${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}/server/database/${DB_TYPE}/option-patches/without-compression/ \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

6
Dockerfiles/build-pgsql/rhel/Dockerfile
View file

@ -64,6 +64,7 @@ RUN --mount=from=sources,target=/tmp/src,z \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${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}/server/database/${DB_TYPE}/option-patches/without-compression/ \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -163,7 +164,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -53,6 +53,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/server/database/${DB_TYPE}/option-patches/with-compression/ \ ${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}/server/database/${DB_TYPE}/option-patches/without-compression/ \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web_service/sbin \ ${ZBX_OUTPUT_DIR}/web_service/sbin \
${ZBX_OUTPUT_DIR}/web_service/conf \ ${ZBX_OUTPUT_DIR}/web_service/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
@ -152,7 +153,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \ mv src/go/bin/zabbix_web_service "${ZBX_OUTPUT_DIR}/web_service/sbin/" && \
cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \ cp src/go/conf/zabbix_web_service.conf "${ZBX_OUTPUT_DIR}/web_service/conf/zabbix_web_service.conf.dist" && \
cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \ cp -a /tmp/conf/web_service/. "${ZBX_OUTPUT_DIR}/web_service/conf/" && \

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

@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/conf \
${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/sbin \
${ZBX_OUTPUT_DIR}/general/bin \ ${ZBX_OUTPUT_DIR}/general/bin \
@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \
mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \
cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \

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

@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/conf \
${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/sbin \
${ZBX_OUTPUT_DIR}/general/bin \ ${ZBX_OUTPUT_DIR}/general/bin \
@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \
mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \
cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \

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

@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/conf \
${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/sbin \
${ZBX_OUTPUT_DIR}/general/bin \ ${ZBX_OUTPUT_DIR}/general/bin \
@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \
mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \
cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \

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

@ -59,6 +59,7 @@ RUN --mount=from=sources,target=/tmp/src,z \
${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/conf \
${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/sbin \
${ZBX_OUTPUT_DIR}/general/bin \ ${ZBX_OUTPUT_DIR}/general/bin \
@ -142,7 +143,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \
mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \
cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \

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

@ -48,6 +48,7 @@ RUN --mount=from=sources,target=/tmp/src,ro \
${ZBX_OUTPUT_DIR}/proxy/conf \ ${ZBX_OUTPUT_DIR}/proxy/conf \
${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \ ${ZBX_OUTPUT_DIR}/proxy/database/${DB_TYPE} \
${ZBX_OUTPUT_DIR}/java_gateway/sbin \ ${ZBX_OUTPUT_DIR}/java_gateway/sbin \
${ZBX_OUTPUT_DIR}/java_gateway/conf \
${ZBX_OUTPUT_DIR}/web/conf \ ${ZBX_OUTPUT_DIR}/web/conf \
${ZBX_OUTPUT_DIR}/general/sbin \ ${ZBX_OUTPUT_DIR}/general/sbin \
${ZBX_OUTPUT_DIR}/general/bin \ ${ZBX_OUTPUT_DIR}/general/bin \
@ -131,7 +132,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \ cp conf/zabbix_proxy.conf "${ZBX_OUTPUT_DIR}/proxy/conf/zabbix_proxy.conf.dist" && \
cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \ cp -a /tmp/conf/proxy/. "${ZBX_OUTPUT_DIR}/proxy/conf/" && \
cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \ cp -a src/zabbix_java/bin/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/bin/" && \
cp -a src/zabbix_java/lib/. "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \ cp -a src/zabbix_java/lib/*.jar "${ZBX_OUTPUT_DIR}/java_gateway/sbin/lib/" && \
cp src/zabbix_java/lib/logback.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback.xml.dist" && \
cp src/zabbix_java/lib/logback-console.xml "${ZBX_OUTPUT_DIR}/java_gateway/conf/logback-console.xml.dist" && \
cp -a /tmp/conf/java-gateway/. "${ZBX_OUTPUT_DIR}/java_gateway/conf/" && \
mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_get/zabbix_get "${ZBX_OUTPUT_DIR}/general/bin/" && \
mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \ mv src/zabbix_sender/zabbix_sender "${ZBX_OUTPUT_DIR}/general/bin/" && \
cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \ cp -a /tmp/conf/web/. "${ZBX_OUTPUT_DIR}/web/conf/" && \

4
Dockerfiles/java-gateway/README.md
View file

@ -76,9 +76,9 @@ This variable is used to specify log level. By default, value is `info`. The var
Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones. Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones.
### `ZABBIX_OPTIONS` ### `ZBX_JAVA_OPTS`
Additional arguments for Zabbix Java Gateway. Useful to enable additional libraries and features. Additional Java Virtual Machine (JVM) options for Zabbix Java Gateway, for example `-Xms128m -Xmx1g`.
## Allowed volumes for the Zabbix Java Gateway container ## Allowed volumes for the Zabbix Java Gateway container

3
Dockerfiles/java-gateway/alpine/Dockerfile
View file

@ -32,6 +32,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(apk --print-arch)"; \ ARCH_SUFFIX="$(apk --print-arch)"; \
@ -60,8 +61,6 @@ RUN set -eux && \
zabbix && \ zabbix && \
mkdir -p ${ZABBIX_CONF_DIR}/ \ mkdir -p ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib/ && \ /usr/sbin/zabbix_java/ext_lib/ && \
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \
FIX_PERM_LIST="\ FIX_PERM_LIST="\
${ZABBIX_CONF_DIR}/ \ ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib" && \ /usr/sbin/zabbix_java/ext_lib" && \

3
Dockerfiles/java-gateway/centos/Dockerfile
View file

@ -31,6 +31,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -62,8 +63,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
zabbix && \ zabbix && \
mkdir -p ${ZABBIX_CONF_DIR}/ \ mkdir -p ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib/ && \ /usr/sbin/zabbix_java/ext_lib/ && \
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \
FIX_PERM_LIST="\ FIX_PERM_LIST="\
${ZABBIX_CONF_DIR}/ \ ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib" && \ /usr/sbin/zabbix_java/ext_lib" && \

3
Dockerfiles/java-gateway/ol/Dockerfile
View file

@ -31,6 +31,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -61,8 +62,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
zabbix && \ zabbix && \
mkdir -p ${ZABBIX_CONF_DIR}/ \ mkdir -p ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib/ && \ /usr/sbin/zabbix_java/ext_lib/ && \
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \
FIX_PERM_LIST="\ FIX_PERM_LIST="\
${ZABBIX_CONF_DIR}/ \ ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib" && \ /usr/sbin/zabbix_java/ext_lib" && \

3
Dockerfiles/java-gateway/rhel/Dockerfile
View file

@ -50,6 +50,7 @@ STOPSIGNAL SIGTERM
COPY ["licenses", "/licenses"] COPY ["licenses", "/licenses"]
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--mount=type=tmpfs,target=/var/cache/yum/ \ --mount=type=tmpfs,target=/var/cache/yum/ \
@ -82,8 +83,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
zabbix && \ zabbix && \
mkdir -p ${ZABBIX_CONF_DIR}/ \ mkdir -p ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib/ && \ /usr/sbin/zabbix_java/ext_lib/ && \
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \
FIX_PERM_LIST="\ FIX_PERM_LIST="\
${ZABBIX_CONF_DIR}/ \ ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib" && \ /usr/sbin/zabbix_java/ext_lib" && \

4
Dockerfiles/java-gateway/rhel/README.html
View file

@ -37,8 +37,8 @@
<p>This variable is used to specify log level. By default, value is <code>info</code>. The variable allows next values: <code>trace</code>, <code>debug</code>, <code>info</code>, <code>warn</code>, <code>error</code>, <code>all</code>, <code>off</code></p> <p>This variable is used to specify log level. By default, value is <code>info</code>. The variable allows next values: <code>trace</code>, <code>debug</code>, <code>info</code>, <code>warn</code>, <code>error</code>, <code>all</code>, <code>off</code></p>
<h4><code>ZBX_PROPERTIES_FILE</code></h4> <h4><code>ZBX_PROPERTIES_FILE</code></h4>
<p>Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones.</p> <p>Name of properties file. Can be used to set additional properties using a key-value format in such a way that they are not visible on a command line or to overwrite existing ones.</p>
<h4><code>ZABBIX_OPTIONS</code></h4> <h4><code>ZBX_JAVA_OPTS</code></h4>
<p>Additional arguments for Zabbix Java Gateway. Useful to enable additional libraries and features.</p> <p>Additional Java Virtual Machine (JVM) options for Zabbix Java Gateway, for example <code>-Xms128m -Xmx1g</code>.</p>
<h3>Allowed volumes for the Zabbix Java Gateway container</h3> <h3>Allowed volumes for the Zabbix Java Gateway container</h3>
<h4><code>/usr/sbin/zabbix_java/ext_lib</code></h4> <h4><code>/usr/sbin/zabbix_java/ext_lib</code></h4>
<p>The volume allows include additional JAR files to extend allowed protocols for Zabbix Java Gateway.</p> <p>The volume allows include additional JAR files to extend allowed protocols for Zabbix Java Gateway.</p>

3
Dockerfiles/java-gateway/ubuntu/Dockerfile
View file

@ -31,6 +31,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/ /usr/sbin/zabbix_java/
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/java_gateway/conf/ ${ZABBIX_CONF_DIR}/
RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
--mount=type=cache,target=/var/lib/apt/,sharing=locked \ --mount=type=cache,target=/var/lib/apt/,sharing=locked \
@ -55,8 +56,6 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
zabbix && \ zabbix && \
mkdir -p ${ZABBIX_CONF_DIR}/ \ mkdir -p ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib/ && \ /usr/sbin/zabbix_java/ext_lib/ && \
rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \
FIX_PERM_LIST="\ FIX_PERM_LIST="\
${ZABBIX_CONF_DIR}/ \ ${ZABBIX_CONF_DIR}/ \
/usr/sbin/zabbix_java/ext_lib" && \ /usr/sbin/zabbix_java/ext_lib" && \

2
env_vars/.env_java
View file

@ -2,5 +2,5 @@
# ZBX_LISTEN_PORT=10052 # ZBX_LISTEN_PORT=10052
# ZBX_START_POLLERS=5 # ZBX_START_POLLERS=5
# ZBX_TIMEOUT=3 # ZBX_TIMEOUT=3
# Possible values: trace, debug, info, want, error, all, off # Possible values: trace, debug, info, warn, error, all, off
# ZBX_DEBUGLEVEL=info # ZBX_DEBUGLEVEL=info

11
templates/config/java-gateway/zabbix_java_gateway_logback.xml Normal file
View file

@ -0,0 +1,11 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="${ZBX_DEBUGLEVEL:-info}">
<appender-ref ref="STDOUT" />
</root>
</configuration>

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

@ -22,22 +22,13 @@ build_classpath() {
printf '%s\n' "$classpath" printf '%s\n' "$classpath"
} }
update_config() {
info "** Preparing Zabbix Java Gateway log configuration file"
[[ -f "$ZBX_GATEWAY_CONFIG" ]] || error "Missing configuration file: $ZBX_GATEWAY_CONFIG"
: "${ZBX_DEBUGLEVEL:=info}"
info "Updating ${ZBX_GATEWAY_CONFIG} 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
}
run_service() { run_service() {
info "** Preparing Zabbix Java Gateway" info "** Preparing Zabbix Java Gateway"
: "${ZBX_TIMEOUT:=3}" : "${ZBX_TIMEOUT:=3}"
update_config [[ -f "$ZBX_GATEWAY_CONFIG" ]] || error "Missing configuration file: $ZBX_GATEWAY_CONFIG"
cd "$ZABBIX_JAVA_DIR" cd "$ZABBIX_JAVA_DIR"
local classpath local classpath