extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-22 07:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added PPC64LE arch for Alpine images

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-01-29 16:26:07 +09:00
parent cb73c5f897
commit 27ac8dba9e
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,13 @@ 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="$(arch)"; \
case "$ARCH_SUFFIX" in \
ppc64le) \
openjdk_packages='openjdk11 openjdk11-jre-headless'; \
;; \
*) openjdk_packages='openjdk17 openjdk17-jre-headless'; \
esac; \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
autoconf \ autoconf \
automake \ automake \
@ -38,13 +45,12 @@ RUN set -eux && \
patch \ patch \
pcre2-dev \ pcre2-dev \
postgresql-dev \ postgresql-dev \
openjdk17 \
gettext \ gettext \
git \ git \
g++ \ g++ \
go \ go \
make \ make \
openjdk17-jre-headless \ $openjdk_packages \
unixodbc-dev" && \ unixodbc-dev" && \
apk add \ apk add \
--no-cache \ --no-cache \

2
Dockerfiles/build-mysql/alpine/Dockerfile
View File

@ -40,7 +40,7 @@ RUN set -eux && \
additional_components='--enable-java'; \ additional_components='--enable-java'; \
;; \ ;; \
ppc64le) \ ppc64le) \
additional_components=''; \ additional_components='--enable-java'; \
;; \ ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \ esac; \

2
Dockerfiles/build-pgsql/alpine/Dockerfile
View File

@ -40,7 +40,7 @@ RUN set -eux && \
additional_components='--enable-java'; \ additional_components='--enable-java'; \
;; \ ;; \
ppc64le) \ ppc64le) \
additional_components=''; \ additional_components='--enable-java'; \
;; \ ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \ esac; \

2
Dockerfiles/build-sqlite3/alpine/Dockerfile
View File

@ -38,7 +38,7 @@ RUN set -eux && \
additional_components='--enable-java'; \ additional_components='--enable-java'; \
;; \ ;; \
ppc64le) \ ppc64le) \
additional_components=''; \ additional_components='--enable-java'; \
;; \ ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \ esac; \

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

@ -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"] COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib", "/usr/sbin/zabbix_java/lib"]
RUN set -eux && \ 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 \ INSTALL_PKGS="bash \
openjdk17-jre-headless" && \ $openjdk_packages" && \
apk add \ apk add \
--no-cache \ --no-cache \
--clean-protected \ --clean-protected \

3
build.json
View File

@ -5,7 +5,8 @@
"linux/amd64", "linux/amd64",
"linux/arm/v7", "linux/arm/v7",
"linux/arm64", "linux/arm64",
"linux/s390x" "linux/s390x",
"linux/ppc64le"
], ],
"ol": [ "ol": [
"linux/amd64", "linux/amd64",