extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-19 17:38:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed arch detection on Alpine

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-02-05 20:07:33 +09:00
parent ad32b8d7f2
commit 2eb71a5c21
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,9 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
org.opencontainers.image.version="${ZBX_VERSION}" org.opencontainers.image.version="${ZBX_VERSION}"
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(uname -m)"; \ ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
i686) \ x86) \
openjdk_packages='openjdk8 openjdk8-jre-base'; \ openjdk_packages='openjdk8 openjdk8-jre-base'; \
;; \ ;; \
ppc64le) \ ppc64le) \

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

@ -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"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbin/zabbix_java/lib"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(uname -m)"; \ ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
i686) \ x86) \
openjdk_packages='openjdk8-jre-base'; \ openjdk_packages='openjdk8-jre-base'; \
;; \ ;; \
ppc64le) \ ppc64le) \