From 2419790650552bf184d6d88dcae15e70cdea8e68 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 5 Feb 2024 21:19:33 +0900 Subject: [PATCH] Allow build Java Gateway on PPC64LE arch --- Dockerfiles/build-mysql/alpine/Dockerfile | 21 +-------------------- Dockerfiles/build-mysql/centos/Dockerfile | 15 +-------------- Dockerfiles/build-mysql/rhel/Dockerfile | 15 +-------------- Dockerfiles/build-mysql/ubuntu/Dockerfile | 21 +-------------------- Dockerfiles/build-pgsql/alpine/Dockerfile | 21 +-------------------- Dockerfiles/build-pgsql/centos/Dockerfile | 15 +-------------- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 21 +-------------------- Dockerfiles/build-sqlite3/alpine/Dockerfile | 21 +-------------------- Dockerfiles/build-sqlite3/centos/Dockerfile | 15 +-------------- Dockerfiles/build-sqlite3/rhel/Dockerfile | 15 +-------------- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 21 +-------------------- 11 files changed, 11 insertions(+), 190 deletions(-) diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 2fbc76c12..2069a3c3d 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -25,25 +25,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -77,7 +58,7 @@ RUN set -eux && \ --with-openssl \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 048bc7d94..3de696b9e 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -25,19 +25,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -72,7 +59,7 @@ RUN set -eux && \ --with-openssl \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 09040e9d0..6aa1edba1 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -35,19 +35,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -81,7 +68,7 @@ RUN set -eux && \ --with-openssl \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 24c4c70f5..a83fabf7f 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -25,25 +25,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -77,7 +58,7 @@ RUN set -eux && \ --with-openssl \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 60c51473a..45ba9b1a5 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -25,25 +25,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -77,7 +58,7 @@ RUN set -eux && \ --with-postgresql \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index ebb2c9a48..0b8754c16 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -25,19 +25,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -71,7 +58,7 @@ RUN set -eux && \ --with-postgresql \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index b0f2459c2..7cee56822 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -25,25 +25,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"] 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -77,7 +58,7 @@ RUN set -eux && \ --with-postgresql \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index af3f28b65..36bf45360 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -23,25 +23,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=${ZBX_VERSION} 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -72,7 +53,7 @@ RUN set -eux && \ --with-sqlite3 \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index e3073d3d5..5f3328f6e 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -23,19 +23,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=${ZBX_VERSION} 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -66,7 +53,7 @@ RUN set -eux && \ --with-sqlite3 \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile index a0a09070b..fabba280f 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -33,19 +33,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=${ZBX_VERSION} 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -76,7 +63,7 @@ RUN set -eux && \ --with-sqlite3 \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index bd2dad027..b1bc8cc17 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -23,25 +23,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=${ZBX_VERSION} 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/ && \ git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -72,7 +53,7 @@ RUN set -eux && \ --with-sqlite3 \ --with-ssh \ --with-unixodbc \ - $additional_components \ + --enable-java \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \