Added riscv64 arch for Alpine and Ubuntu images. Using openjdk17 for ppc64le on Alpine

This commit is contained in:
Alexey Pustovalov 2024-12-07 20:32:05 +09:00
parent ecb200f835
commit eb1208f7c5
3 changed files with 8 additions and 12 deletions

View File

@ -24,11 +24,8 @@ RUN set -eux && \
x86) \ x86) \
openjdk_packages='openjdk8 openjdk8-jre-base'; \ openjdk_packages='openjdk8 openjdk8-jre-base'; \
;; \ ;; \
armv7) \ riscv64) \
openjdk_packages='openjdk8 openjdk8-jre-base'; \ openjdk_packages='openjdk21 openjdk21-jre-headless'; \
;; \
ppc64le) \
openjdk_packages='openjdk11 openjdk11-jre-headless'; \
;; \ ;; \
*) openjdk_packages='openjdk17 openjdk17-jre-headless'; \ *) openjdk_packages='openjdk17 openjdk17-jre-headless'; \
esac; \ esac; \

View File

@ -35,11 +35,8 @@ RUN set -eux && \
x86) \ x86) \
openjdk_packages='openjdk8-jre-base'; \ openjdk_packages='openjdk8-jre-base'; \
;; \ ;; \
armv7) \ riscv64) \
openjdk_packages='openjdk8 openjdk8-jre-base'; \ openjdk_packages='openjdk21 openjdk21-jre-headless'; \
;; \
ppc64le) \
openjdk_packages='openjdk11-jre-headless'; \
;; \ ;; \
*) openjdk_packages='openjdk17-jre-headless'; \ *) openjdk_packages='openjdk17-jre-headless'; \
esac; \ esac; \

View File

@ -6,7 +6,8 @@
"linux/arm/v7", "linux/arm/v7",
"linux/arm64", "linux/arm64",
"linux/s390x", "linux/s390x",
"linux/ppc64le" "linux/ppc64le",
"linux/riscv64"
], ],
"centos": [ "centos": [
"linux/amd64", "linux/amd64",
@ -24,7 +25,8 @@
"linux/amd64", "linux/amd64",
"linux/arm/v7", "linux/arm/v7",
"linux/arm64", "linux/arm64",
"linux/s390x" "linux/s390x",
"linux/riscv64"
] ]
}, },
"os-windows": { "os-windows": {