From 6418ecb0c03e9e32056206b8c614daa49ddf4bca Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 5 Feb 2024 20:07:33 +0900
Subject: [PATCH] Removed unused libxml2 for agent and agent2 images

---
 Dockerfiles/agent/ubuntu/Dockerfile        | 1 -
 Dockerfiles/agent2/ubuntu/Dockerfile       | 1 -
 Dockerfiles/build-base/alpine/Dockerfile   | 4 ++--
 Dockerfiles/java-gateway/alpine/Dockerfile | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile
index 777a5b6e8..3caa3f8e7 100644
--- a/Dockerfiles/agent/ubuntu/Dockerfile
+++ b/Dockerfiles/agent/ubuntu/Dockerfile
@@ -38,7 +38,6 @@ RUN set -eux && \
             tzdata \
             ca-certificates \
             libssl3 \
-            libxml2 \
             libcurl4 \
             libmodbus5 \
             libpcre2-8-0 \
diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
index 2dc7db974..d47b165db 100644
--- a/Dockerfiles/agent2/ubuntu/Dockerfile
+++ b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -44,7 +44,6 @@ RUN set -eux && \
             smartmontools \
             sudo \
             libssl3 \
-            libxml2 \
             libcurl4 \
             libpcre2-8-0 \
             libldap-2.4" && \
diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
index 151d94b12..13adda061 100644
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@@ -19,9 +19,9 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
       org.opencontainers.image.version="${ZBX_VERSION}"
 
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
+    ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
     case "$ARCH_SUFFIX" in \
-        i686) \
+        x86) \
             openjdk_packages='openjdk8 openjdk8-jre-base'; \
             ;; \
         armv7) \
diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile
index 8ac320f17..0a4639869 100644
--- a/Dockerfiles/java-gateway/alpine/Dockerfile
+++ b/Dockerfiles/java-gateway/alpine/Dockerfile
@@ -31,9 +31,9 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin", "/usr/sbi
 COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbin/zabbix_java/lib"]
 
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
+    ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
     case "$ARCH_SUFFIX" in \
-        i686) \
+        x86) \
             openjdk_packages='openjdk8-jre-base'; \
             ;; \
         armv7) \