From 963745363d3cee3edb3a5307b16b39fadbc06e10 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 13 Sep 2021 17:44:52 +0200
Subject: [PATCH] Optimized Java Gateway build process

---
 java-gateway/alpine/Dockerfile                    |  5 ++---
 .../etc/zabbix/zabbix_java_gateway_logback.xml    | 15 ---------------
 java-gateway/alpine/docker-entrypoint.sh          | 12 ++++--------
 java-gateway/centos/Dockerfile                    |  5 ++---
 .../etc/zabbix/zabbix_java_gateway_logback.xml    | 15 ---------------
 java-gateway/centos/docker-entrypoint.sh          | 12 ++++--------
 java-gateway/ubuntu/Dockerfile                    |  5 ++---
 .../etc/zabbix/zabbix_java_gateway_logback.xml    | 15 ---------------
 java-gateway/ubuntu/docker-entrypoint.sh          | 12 ++++--------
 9 files changed, 18 insertions(+), 78 deletions(-)
 delete mode 100644 java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml
 delete mode 100644 java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml
 delete mode 100644 java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml

diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile
index 68fd1f99c..e3865169a 100644
--- a/java-gateway/alpine/Dockerfile
+++ b/java-gateway/alpine/Dockerfile
@@ -39,8 +39,6 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
       org.opencontainers.image.version="${ZBX_VERSION}" \
       org.opencontainers.image.source="${ZBX_SOURCES}"
 
-COPY ["conf/etc/", "/etc/"]
-
 RUN set -eux && \
     apk add --no-cache --virtual build-dependencies \
             autoconf \
@@ -69,7 +67,8 @@ RUN set -eux && \
     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}/ && \
     chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
diff --git a/java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml
deleted file mode 100644
index 750f3506f..000000000
--- a/java-gateway/alpine/conf/etc/zabbix/zabbix_java_gateway_logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<configuration scan="true" scanPeriod="15 seconds">
-
-	<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="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh
index 01ac14cd1..c2bea7442 100755
--- a/java-gateway/alpine/docker-entrypoint.sh
+++ b/java-gateway/alpine/docker-entrypoint.sh
@@ -18,14 +18,10 @@ prepare_java_gateway_config() {
 
     ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
 
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
+    : ${ZBX_DEBUGLEVEL:="info"}
+
+    echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
+    sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
 }
 
 prepare_java_gateway() {
diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile
index dc696d0bd..89ad96194 100644
--- a/java-gateway/centos/Dockerfile
+++ b/java-gateway/centos/Dockerfile
@@ -38,8 +38,6 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
       org.opencontainers.image.version="${ZBX_VERSION}" \
       org.opencontainers.image.source="${ZBX_SOURCES}"
 
-COPY ["conf/etc/", "/etc/"]
-
 RUN set -eux && \
     yum --quiet makecache && \
     yum -y install --setopt=tsflags=nodocs \
@@ -67,7 +65,8 @@ RUN set -eux && \
     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}/ && \
     yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
diff --git a/java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml
deleted file mode 100644
index 750f3506f..000000000
--- a/java-gateway/centos/conf/etc/zabbix/zabbix_java_gateway_logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<configuration scan="true" scanPeriod="15 seconds">
-
-	<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="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh
index 01ac14cd1..c2bea7442 100755
--- a/java-gateway/centos/docker-entrypoint.sh
+++ b/java-gateway/centos/docker-entrypoint.sh
@@ -18,14 +18,10 @@ prepare_java_gateway_config() {
 
     ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
 
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
+    : ${ZBX_DEBUGLEVEL:="info"}
+
+    echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
+    sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
 }
 
 prepare_java_gateway() {
diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile
index cdc860039..9b92f20c4 100644
--- a/java-gateway/ubuntu/Dockerfile
+++ b/java-gateway/ubuntu/Dockerfile
@@ -39,8 +39,6 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
       org.opencontainers.image.version="${ZBX_VERSION}" \
       org.opencontainers.image.source="${ZBX_SOURCES}"
 
-COPY ["conf/etc/", "/etc/"]
-
 RUN set -eux && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
@@ -70,7 +68,8 @@ RUN set -eux && \
     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}/ && \
     DEBIAN_FRONTEND=noninteractive apt-get -y purge \
diff --git a/java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml
deleted file mode 100644
index 750f3506f..000000000
--- a/java-gateway/ubuntu/conf/etc/zabbix/zabbix_java_gateway_logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<configuration scan="true" scanPeriod="15 seconds">
-
-	<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="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh
index 01ac14cd1..c2bea7442 100755
--- a/java-gateway/ubuntu/docker-entrypoint.sh
+++ b/java-gateway/ubuntu/docker-entrypoint.sh
@@ -18,14 +18,10 @@ prepare_java_gateway_config() {
 
     ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
 
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
+    : ${ZBX_DEBUGLEVEL:="info"}
+
+    echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
+    sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
 }
 
 prepare_java_gateway() {