From 72ddd79a584628b4db11e71a390ea3610301b367 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 13 Sep 2021 17:56:09 +0200 Subject: [PATCH] Optimized Java Gateway build process --- java-gateway/ol/Dockerfile | 3 ++- .../etc/zabbix/zabbix_java_gateway_logback.xml | 15 --------------- java-gateway/rhel/Dockerfile | 3 ++- .../etc/zabbix/zabbix_java_gateway_logback.xml | 15 --------------- zabbix-appliance/rhel/Dockerfile | 3 ++- .../etc/zabbix/zabbix_java_gateway_logback.xml | 15 --------------- 6 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml delete mode 100644 java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml delete mode 100644 zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml diff --git a/java-gateway/ol/Dockerfile b/java-gateway/ol/Dockerfile index c54511abb..462280050 100644 --- a/java-gateway/ol/Dockerfile +++ b/java-gateway/ol/Dockerfile @@ -51,7 +51,8 @@ RUN set -eux && \ --setopt=install_weak_deps=0 \ --best \ --nodocs ${INSTALL_PKGS} && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \ chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \ chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \ diff --git a/java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/java-gateway/rhel/Dockerfile b/java-gateway/rhel/Dockerfile index 59d6b4aab..61225eedc 100644 --- a/java-gateway/rhel/Dockerfile +++ b/java-gateway/rhel/Dockerfile @@ -90,7 +90,8 @@ RUN set -eux && INSTALL_PKGS="autoconf \ mkdir -p /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ dnf -y history undo last && \ diff --git a/java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 5be573929..464019480 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -169,7 +169,8 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr cp database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ cp -R /tmp/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ diff --git a/zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - -