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

Allow build Java Gateway on PPC64LE arch

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-02-05 21:19:33 +09:00
parent f4697af90a
commit c9a94d3161
13 changed files with 13 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ 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)"; \ ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
ppc64le) \ ppc64le) \
openjdk_packages='openjdk11 openjdk11-jre-headless'; \ openjdk_packages='openjdk11 openjdk11-jre-headless'; \

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

@ -26,25 +26,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
armv7l) \
additional_components='--enable-java'; \
;; \
s390x) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components='--enable-java'; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -78,7 +59,7 @@ RUN set -eux && \
--with-openssl \ --with-openssl \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

15
Dockerfiles/build-mysql/centos/Dockerfile
View File

@ -26,19 +26,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -72,7 +59,7 @@ RUN set -eux && \
--with-openssl \ --with-openssl \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

15
Dockerfiles/build-mysql/rhel/Dockerfile
View File

@ -36,19 +36,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -82,7 +69,7 @@ RUN set -eux && \
--with-openssl \ --with-openssl \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

21
Dockerfiles/build-mysql/ubuntu/Dockerfile
View File

@ -26,25 +26,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
armv7l) \
additional_components='--enable-java'; \
;; \
s390x) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -78,7 +59,7 @@ RUN set -eux && \
--with-openssl \ --with-openssl \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

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

@ -26,25 +26,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
armv7l) \
additional_components='--enable-java'; \
;; \
s390x) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components='--enable-java'; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -78,7 +59,7 @@ RUN set -eux && \
--with-postgresql \ --with-postgresql \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

15
Dockerfiles/build-pgsql/centos/Dockerfile
View File

@ -26,19 +26,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -72,7 +59,7 @@ RUN set -eux && \
--with-postgresql \ --with-postgresql \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

21
Dockerfiles/build-pgsql/ubuntu/Dockerfile
View File

@ -26,25 +26,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"] COPY ["conf/chromedp_no_sandbox.patch", "/tmp/chromedp_no_sandbox.patch"]
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
armv7l) \
additional_components='--enable-java'; \
;; \
s390x) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -78,7 +59,7 @@ RUN set -eux && \
--with-postgresql \ --with-postgresql \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

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

@ -24,25 +24,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
armv7l) \
additional_components='--enable-java'; \
;; \
s390x) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components='--enable-java'; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -73,7 +54,7 @@ RUN set -eux && \
--with-sqlite3 \ --with-sqlite3 \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

15
Dockerfiles/build-sqlite3/centos/Dockerfile
View File

@ -24,19 +24,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -67,7 +54,7 @@ RUN set -eux && \
--with-sqlite3 \ --with-sqlite3 \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

15
Dockerfiles/build-sqlite3/rhel/Dockerfile
View File

@ -34,19 +34,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -77,7 +64,7 @@ RUN set -eux && \
--with-sqlite3 \ --with-sqlite3 \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

21
Dockerfiles/build-sqlite3/ubuntu/Dockerfile
View File

@ -24,25 +24,6 @@ ENV MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLU
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=master
RUN set -eux && \ RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
x86_64) \
additional_components='--enable-java'; \
;; \
aarch64) \
additional_components='--enable-java'; \
;; \
armv7l) \
additional_components='--enable-java'; \
;; \
s390x) \
additional_components='--enable-java'; \
;; \
ppc64le) \
additional_components=''; \
;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
cd /tmp/ && \ cd /tmp/ && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${GIT_BRANCH} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \
@ -73,7 +54,7 @@ RUN set -eux && \
--with-sqlite3 \ --with-sqlite3 \
--with-ssh \ --with-ssh \
--with-unixodbc \ --with-unixodbc \
$additional_components \ --enable-java \
--silent && \ --silent && \
make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s dbschema && \
make -j"$(nproc)" -s && \ make -j"$(nproc)" -s && \

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

@ -31,7 +31,7 @@ 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)"; \ ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
case "$ARCH_SUFFIX" in \ case "$ARCH_SUFFIX" in \
ppc64le) \ ppc64le) \
openjdk_packages='openjdk11-jre-headless'; \ openjdk_packages='openjdk11-jre-headless'; \