extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-05-20 16:11:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-12-07 20:32:05 +09:00
parent 991a9b38df
commit 0d46ce028c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/build-base/alpine/Dockerfile
View File

@ -21,8 +21,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(cat /etc/apk/arch)"; \ ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
ppc64le) \ riscv64) \
openjdk_packages='openjdk11 openjdk11-jre-headless'; \ openjdk_packages='openjdk21 openjdk21-jre-headless'; \
;; \ ;; \
*) openjdk_packages='openjdk17 openjdk17-jre-headless'; \ *) openjdk_packages='openjdk17 openjdk17-jre-headless'; \
esac; \ esac; \

4
Dockerfiles/java-gateway/alpine/Dockerfile
View File

@ -32,8 +32,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/", "/u
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(cat /etc/apk/arch)"; \ ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
ppc64le) \ riscv64) \
openjdk_packages='openjdk11-jre-headless'; \ openjdk_packages='openjdk21 openjdk21-jre-headless'; \
;; \ ;; \
*) openjdk_packages='openjdk17-jre-headless'; \ *) openjdk_packages='openjdk17-jre-headless'; \
esac; \ esac; \

6
build.json
View File

@ -4,7 +4,8 @@
"linux/amd64", "linux/amd64",
"linux/arm64", "linux/arm64",
"linux/s390x", "linux/s390x",
"linux/ppc64le" "linux/ppc64le",
"linux/riscv64"
], ],
"centos": [ "centos": [
"linux/amd64", "linux/amd64",
@ -23,7 +24,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": {