From 2eb71a5c2178a6038f735bc78196b56570fd4983 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] Fixed arch detection on Alpine

---
 Dockerfiles/build-base/alpine/Dockerfile   | 4 ++--
 Dockerfiles/java-gateway/alpine/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
index 21b9d9052..d64cc1904 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="$(uname -m)"; \
+    ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
     case "$ARCH_SUFFIX" in \
-        i686) \
+        x86) \
             openjdk_packages='openjdk8 openjdk8-jre-base'; \
             ;; \
         ppc64le) \
diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile
index 7f1154e86..60e0f68b5 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="$(uname -m)"; \
+    ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
     case "$ARCH_SUFFIX" in \
-        i686) \
+        x86) \
             openjdk_packages='openjdk8-jre-base'; \
             ;; \
         ppc64le) \