mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-25 01:04:01 +01:00
Added PPC64LE arch for Alpine images
This commit is contained in:
parent
cb73c5f897
commit
27ac8dba9e
@ -19,6 +19,13 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||
|
||||
RUN set -eux && \
|
||||
ARCH_SUFFIX="$(arch)"; \
|
||||
case "$ARCH_SUFFIX" in \
|
||||
ppc64le) \
|
||||
openjdk_packages='openjdk11 openjdk11-jre-headless'; \
|
||||
;; \
|
||||
*) openjdk_packages='openjdk17 openjdk17-jre-headless'; \
|
||||
esac; \
|
||||
INSTALL_PKGS="bash \
|
||||
autoconf \
|
||||
automake \
|
||||
@ -38,13 +45,12 @@ RUN set -eux && \
|
||||
patch \
|
||||
pcre2-dev \
|
||||
postgresql-dev \
|
||||
openjdk17 \
|
||||
gettext \
|
||||
git \
|
||||
g++ \
|
||||
go \
|
||||
make \
|
||||
openjdk17-jre-headless \
|
||||
$openjdk_packages \
|
||||
unixodbc-dev" && \
|
||||
apk add \
|
||||
--no-cache \
|
||||
|
@ -40,7 +40,7 @@ RUN set -eux && \
|
||||
additional_components='--enable-java'; \
|
||||
;; \
|
||||
ppc64le) \
|
||||
additional_components=''; \
|
||||
additional_components='--enable-java'; \
|
||||
;; \
|
||||
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
|
||||
esac; \
|
||||
|
@ -40,7 +40,7 @@ RUN set -eux && \
|
||||
additional_components='--enable-java'; \
|
||||
;; \
|
||||
ppc64le) \
|
||||
additional_components=''; \
|
||||
additional_components='--enable-java'; \
|
||||
;; \
|
||||
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
|
||||
esac; \
|
||||
|
@ -38,7 +38,7 @@ RUN set -eux && \
|
||||
additional_components='--enable-java'; \
|
||||
;; \
|
||||
ppc64le) \
|
||||
additional_components=''; \
|
||||
additional_components='--enable-java'; \
|
||||
;; \
|
||||
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
|
||||
esac; \
|
||||
|
@ -31,8 +31,15 @@ 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="$(arch)"; \
|
||||
case "$ARCH_SUFFIX" in \
|
||||
ppc64le) \
|
||||
openjdk_packages='openjdk11-jre-headless'; \
|
||||
;; \
|
||||
*) openjdk_packages='openjdk17-jre-headless'; \
|
||||
esac; \
|
||||
INSTALL_PKGS="bash \
|
||||
openjdk17-jre-headless" && \
|
||||
$openjdk_packages" && \
|
||||
apk add \
|
||||
--no-cache \
|
||||
--clean-protected \
|
||||
|
@ -5,7 +5,8 @@
|
||||
"linux/amd64",
|
||||
"linux/arm/v7",
|
||||
"linux/arm64",
|
||||
"linux/s390x"
|
||||
"linux/s390x",
|
||||
"linux/ppc64le"
|
||||
],
|
||||
"ol": [
|
||||
"linux/amd64",
|
||||
|
Loading…
Reference in New Issue
Block a user