From eb1208f7c5d226fcfa7e00666201d2b64f963f4c Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sat, 7 Dec 2024 20:32:05 +0900
Subject: [PATCH] Added riscv64 arch for Alpine and Ubuntu images. Using
 openjdk17 for ppc64le on Alpine

---
 Dockerfiles/build-base/alpine/Dockerfile   | 7 ++-----
 Dockerfiles/java-gateway/alpine/Dockerfile | 7 ++-----
 build.json                                 | 6 ++++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
index c5873dd1c..e6281761e 100644
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@@ -24,11 +24,8 @@ RUN set -eux && \
         x86) \
             openjdk_packages='openjdk8 openjdk8-jre-base'; \
             ;; \
-        armv7) \
-            openjdk_packages='openjdk8 openjdk8-jre-base'; \
-            ;; \
-        ppc64le) \
-            openjdk_packages='openjdk11 openjdk11-jre-headless'; \
+        riscv64) \
+            openjdk_packages='openjdk21 openjdk21-jre-headless'; \
             ;; \
         *) openjdk_packages='openjdk17 openjdk17-jre-headless'; \
     esac; \
diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile
index dcc232f2e..13caadc48 100644
--- a/Dockerfiles/java-gateway/alpine/Dockerfile
+++ b/Dockerfiles/java-gateway/alpine/Dockerfile
@@ -35,11 +35,8 @@ RUN set -eux && \
         x86) \
             openjdk_packages='openjdk8-jre-base'; \
             ;; \
-        armv7) \
-            openjdk_packages='openjdk8 openjdk8-jre-base'; \
-            ;; \
-        ppc64le) \
-            openjdk_packages='openjdk11-jre-headless'; \
+        riscv64) \
+            openjdk_packages='openjdk21 openjdk21-jre-headless'; \
             ;; \
         *) openjdk_packages='openjdk17-jre-headless'; \
     esac; \
diff --git a/build.json b/build.json
index 11fcd75e9..224c4737c 100644
--- a/build.json
+++ b/build.json
@@ -6,7 +6,8 @@
       "linux/arm/v7",
       "linux/arm64",
       "linux/s390x",
-      "linux/ppc64le"
+      "linux/ppc64le",
+      "linux/riscv64"
     ],
     "centos": [
       "linux/amd64",
@@ -24,7 +25,8 @@
       "linux/amd64",
       "linux/arm/v7",
       "linux/arm64",
-      "linux/s390x"
+      "linux/s390x",
+      "linux/riscv64"
     ]
   },
   "os-windows": {