From b7ec6f24d2445597dc8e20bdc9528b18ea7e6221 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 27 Oct 2021 22:28:33 +0300 Subject: [PATCH 1/9] Added ppc64le platform --- .github/workflows/images_build.yml | 13 ++++- Dockerfile | 58 +++++++++++++++++++++ Dockerfiles/build-mysql/alpine/Dockerfile | 18 ++++++- Dockerfiles/build-mysql/centos/Dockerfile | 15 +++++- Dockerfiles/build-mysql/ubuntu/Dockerfile | 18 ++++++- Dockerfiles/build-pgsql/alpine/Dockerfile | 18 ++++++- Dockerfiles/build-pgsql/centos/Dockerfile | 15 +++++- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 18 ++++++- Dockerfiles/build-sqlite3/alpine/Dockerfile | 18 ++++++- Dockerfiles/build-sqlite3/centos/Dockerfile | 15 +++++- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 18 ++++++- build.json | 9 ++-- 12 files changed, 219 insertions(+), 14 deletions(-) create mode 100644 Dockerfile diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index 8a99d3406..523bdb932 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -126,6 +126,7 @@ jobs: id: platform run: | platform_list=$(jq -r '.["os-linux"].${{ matrix.os }} | join(",")' "./build.json") + platform_list="${platform_list%,}" echo ::set-output name=list::$platform_list @@ -166,7 +167,7 @@ jobs: if-no-files-found: error build_base_database: - timeout-minutes: 70 + timeout-minutes: 90 needs: [ "build_base", "init_build"] name: Build ${{ matrix.build }} base on ${{ matrix.os }} strategy: @@ -196,6 +197,7 @@ jobs: id: platform run: | platform_list=$(jq -r '.["os-linux"].${{ matrix.os }} | join(",")' "./build.json") + platform_list="${platform_list%,}" echo ::set-output name=list::$platform_list @@ -251,7 +253,7 @@ jobs: if-no-files-found: error build_images: - timeout-minutes: 70 + timeout-minutes: 90 needs: [ "build_base_database", "init_build"] name: Build ${{ matrix.build }} on ${{ matrix.os }} strategy: @@ -286,6 +288,13 @@ jobs: platform_list=$(jq -r '.["os-linux"].${{ matrix.os }} | join(",")' "./build.json") fi + # Can not compile Java applications on ppc64le + if [ "${{ matrix.build }}" == "java-gateway" ]; then + platform_list="${platform_list%linux/ppc64le}" + fi + + platform_list="${platform_list%,}" + echo ::set-output name=list::$platform_list - name: Detect Build Base Image diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..c03ae1898 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,58 @@ +FROM centos:8 + +ENV TERM=xterm \ + PATH=/usr/local/go/bin:$PATH + +RUN set -eux && \ + dnf -y install \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --enablerepo "appstream" \ + wget && \ + cd /tmp/ && \ + ARCH_SUFFIX="$(arch)"; \ + case "$ARCH_SUFFIX" in \ + x86_64) \ + url='https://dl.google.com/go/go1.17.2.linux-amd64.tar.gz'; \ + sha256='f242a9db6a0ad1846de7b6d94d507915d14062660616a61ef7c808a76e4f1676'; \ + ;; \ + aarch64) \ + url='https://dl.google.com/go/go1.17.2.linux-arm64.tar.gz'; \ + sha256='a5a43c9cdabdb9f371d56951b14290eba8ce2f9b0db48fb5fc657943984fd4fc'; \ + ;; \ + ppc64le) \ + url='https://golang.org/dl/go1.17.2.linux-ppc64le.tar.gz'; \ + sha256='12e2dc7e0ffeebe77083f267ef6705fec1621cdf2ed6489b3af04a13597ed68d'; \ + ;; \ + *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ + esac; \ + wget -O go.tgz.asc "$url.asc" && \ + wget -O go.tgz "$url" --progress=dot:giga && \ + echo "$sha256 *go.tgz" | sha256sum -c - && \ + GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \ + gpg --batch --verify go.tgz.asc go.tgz && \ + gpgconf --kill all && \ + rm -rf "$GNUPGHOME" go.tgz.asc && \ + tar -C /usr/local -xzf go.tgz && \ + rm go.tgz + +RUN set -eux && \ + dnf -y install \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --enablerepo "appstream" \ + --enablerepo "powertools" \ + rpmdevtools \ + dnf-plugins-core \ + rpmlint && \ + rpm -ivh https://repo.zabbix.com/zabbix/5.4/rhel/8/SRPMS/zabbix-5.4.6-1.el8.src.rpm && \ + cd /root/rpmbuild/ && \ + dnf -y builddep \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --enablerepo "appstream" \ + --enablerepo "powertools" \ + SPECS/zabbix.spec && \ +# rpmlint SPECS/zabbix.spec && \ + rpmbuild -ba SPECS/zabbix.spec diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 5612bebd6..427995392 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -20,6 +20,22 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov Date: Wed, 27 Oct 2021 22:28:54 +0300 Subject: [PATCH 2/9] Added ppc64le platform --- Dockerfile | 58 ------------------------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index c03ae1898..000000000 --- a/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -FROM centos:8 - -ENV TERM=xterm \ - PATH=/usr/local/go/bin:$PATH - -RUN set -eux && \ - dnf -y install \ - --disablerepo "*" \ - --enablerepo "baseos" \ - --enablerepo "appstream" \ - wget && \ - cd /tmp/ && \ - ARCH_SUFFIX="$(arch)"; \ - case "$ARCH_SUFFIX" in \ - x86_64) \ - url='https://dl.google.com/go/go1.17.2.linux-amd64.tar.gz'; \ - sha256='f242a9db6a0ad1846de7b6d94d507915d14062660616a61ef7c808a76e4f1676'; \ - ;; \ - aarch64) \ - url='https://dl.google.com/go/go1.17.2.linux-arm64.tar.gz'; \ - sha256='a5a43c9cdabdb9f371d56951b14290eba8ce2f9b0db48fb5fc657943984fd4fc'; \ - ;; \ - ppc64le) \ - url='https://golang.org/dl/go1.17.2.linux-ppc64le.tar.gz'; \ - sha256='12e2dc7e0ffeebe77083f267ef6705fec1621cdf2ed6489b3af04a13597ed68d'; \ - ;; \ - *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \ - esac; \ - wget -O go.tgz.asc "$url.asc" && \ - wget -O go.tgz "$url" --progress=dot:giga && \ - echo "$sha256 *go.tgz" | sha256sum -c - && \ - GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \ - gpg --batch --verify go.tgz.asc go.tgz && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" go.tgz.asc && \ - tar -C /usr/local -xzf go.tgz && \ - rm go.tgz - -RUN set -eux && \ - dnf -y install \ - --disablerepo "*" \ - --enablerepo "baseos" \ - --enablerepo "appstream" \ - --enablerepo "powertools" \ - rpmdevtools \ - dnf-plugins-core \ - rpmlint && \ - rpm -ivh https://repo.zabbix.com/zabbix/5.4/rhel/8/SRPMS/zabbix-5.4.6-1.el8.src.rpm && \ - cd /root/rpmbuild/ && \ - dnf -y builddep \ - --disablerepo "*" \ - --enablerepo "baseos" \ - --enablerepo "appstream" \ - --enablerepo "powertools" \ - SPECS/zabbix.spec && \ -# rpmlint SPECS/zabbix.spec && \ - rpmbuild -ba SPECS/zabbix.spec From a6b6c1a7e81599ddee687aa8352b0ed053cfc41a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 Oct 2021 01:45:54 +0300 Subject: [PATCH 3/9] Added s390x for Ubuntu --- .github/workflows/images_build.yml | 32 +++++++++++++++++---- Dockerfiles/build-mysql/ubuntu/Dockerfile | 3 ++ Dockerfiles/build-pgsql/ubuntu/Dockerfile | 3 ++ Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 3 ++ build.json | 2 ++ 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index 523bdb932..64fbfbbd7 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -111,10 +111,15 @@ jobs: fetch-depth: 1 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v1.2.0 + with: + image: tonistiigi/binfmt:latest + platforms: all - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v1.6.0 + with: + driver-opts: image=moby/buildkit:master - name: Login to DockerHub uses: docker/login-action@v1 @@ -182,10 +187,15 @@ jobs: uses: actions/checkout@v2.3.4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v1.2.0 + with: + image: tonistiigi/binfmt:latest + platforms: all - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v1.6.0 + with: + driver-opts: image=moby/buildkit:master - name: Login to DockerHub uses: docker/login-action@v1 @@ -267,10 +277,15 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v1.2.0 + with: + image: tonistiigi/binfmt:latest + platforms: all - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v1.6.0 + with: + driver-opts: image=moby/buildkit:master - name: Login to DockerHub uses: docker/login-action@v1 @@ -288,6 +303,11 @@ jobs: platform_list=$(jq -r '.["os-linux"].${{ matrix.os }} | join(",")' "./build.json") fi + # Build only Agent and Agent2 on 386 + if [ "${{ matrix.build }}" != "agent"* ]; then + platform_list="${platform_list#linux/386,}" + fi + # Can not compile Java applications on ppc64le if [ "${{ matrix.build }}" == "java-gateway" ]; then platform_list="${platform_list%linux/ppc64le}" diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 3e2d3265b..501d4f3a4 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -31,6 +31,9 @@ RUN set -eux && \ armv7l) \ additional_components='--enable-java'; \ ;; \ + s390x) \ + additional_components='--enable-java'; \ + ;; \ ppc64le) \ additional_components=''; \ ;; \ diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 501a05f67..31143d591 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -31,6 +31,9 @@ RUN set -eux && \ armv7l) \ additional_components='--enable-java'; \ ;; \ + s390x) \ + additional_components='--enable-java'; \ + ;; \ ppc64le) \ additional_components=''; \ ;; \ diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 33645057e..6e24eebdd 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -31,6 +31,9 @@ RUN set -eux && \ armv7l) \ additional_components='--enable-java'; \ ;; \ + s390x) \ + additional_components='--enable-java'; \ + ;; \ ppc64le) \ additional_components=''; \ ;; \ diff --git a/build.json b/build.json index 9ae7568b5..9f9a2f157 100644 --- a/build.json +++ b/build.json @@ -1,6 +1,7 @@ { "os-linux": { "alpine": [ + "linux/386", "linux/amd64", "linux/arm/v6", "linux/arm/v7", @@ -15,6 +16,7 @@ "linux/amd64", "linux/arm/v7", "linux/arm64", + "linux/s390x", "linux/ppc64le" ], "centos": [ From c762d9a3a17592d7650440f427111201731252c5 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 Oct 2021 03:03:52 +0300 Subject: [PATCH 4/9] Added ppc64le platform --- build.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.json b/build.json index 9f9a2f157..00048080f 100644 --- a/build.json +++ b/build.json @@ -5,8 +5,7 @@ "linux/amd64", "linux/arm/v6", "linux/arm/v7", - "linux/arm64", - "linux/ppc64le" + "linux/arm64" ], "ol": [ "linux/amd64", @@ -16,8 +15,7 @@ "linux/amd64", "linux/arm/v7", "linux/arm64", - "linux/s390x", - "linux/ppc64le" + "linux/s390x" ], "centos": [ "linux/amd64", From 7cd186e10eac52384635ca10484ef8ecac44b8b7 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 Oct 2021 03:05:53 +0300 Subject: [PATCH 5/9] Added ppc64le platform --- .github/workflows/images_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index 64fbfbbd7..019430939 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -12,6 +12,7 @@ on: - 'trunk' paths: - 'Dockerfiles/**' + - 'build.json' - '!**/README.md' - '!Dockerfiles/*/rhel/*' - '!Dockerfiles/*/windows/*' From 52c2f424e2dcd580fa24668f1e13857e68ef1b5c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 Oct 2021 12:10:47 +0300 Subject: [PATCH 6/9] Added s390x for Alpine --- Dockerfiles/build-mysql/alpine/Dockerfile | 3 +++ Dockerfiles/build-pgsql/alpine/Dockerfile | 3 +++ Dockerfiles/build-sqlite3/alpine/Dockerfile | 3 +++ build.json | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 427995392..d9233a490 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -31,6 +31,9 @@ RUN set -eux && \ armv7l) \ additional_components='--enable-java'; \ ;; \ + s390x) \ + additional_components='--enable-java'; \ + ;; \ ppc64le) \ additional_components=''; \ ;; \ diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index f72f39c84..3660db7a2 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -31,6 +31,9 @@ RUN set -eux && \ armv7l) \ additional_components='--enable-java'; \ ;; \ + s390x) \ + additional_components='--enable-java'; \ + ;; \ ppc64le) \ additional_components=''; \ ;; \ diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 7bdd39618..6f9cd904c 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -31,6 +31,9 @@ RUN set -eux && \ armv7l) \ additional_components='--enable-java'; \ ;; \ + s390x) \ + additional_components='--enable-java'; \ + ;; \ ppc64le) \ additional_components=''; \ ;; \ diff --git a/build.json b/build.json index 00048080f..560faa8a9 100644 --- a/build.json +++ b/build.json @@ -5,7 +5,8 @@ "linux/amd64", "linux/arm/v6", "linux/arm/v7", - "linux/arm64" + "linux/arm64", + "linux/s390x" ], "ol": [ "linux/amd64", From f215087bd5d2383a1765b4dce94c339f820cd408 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 28 Oct 2021 13:58:15 +0300 Subject: [PATCH 7/9] Added s390x for Alpine --- .github/workflows/images_build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index 019430939..b67f1c404 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -298,8 +298,11 @@ jobs: id: platform run: | # Chromium on Alpine is available only on linux/amd64, linux/arm64 platforms - if [ "${{ matrix.os }}" == "alpine" ] && [ "${{ matrix.build }}" == "web-service" ]; then + if ([ "${{ matrix.os }}" == "alpine" ] || [ "${{ matrix.os }}" == "centos" ]) && [ "${{ matrix.build }}" == "web-service" ]; then platform_list="linux/amd64,linux/arm64" + # Chromium on Ubuntu is not available on s390x platform + elif [ "${{ matrix.os }}" == "ubuntu" ] && [ "${{ matrix.build }}" == "web-service" ]; then + platform_list="linux/amd64,linux/arm/v7,linux/arm64" else platform_list=$(jq -r '.["os-linux"].${{ matrix.os }} | join(",")' "./build.json") fi From 1fa91212a24d4959e732dfab8b19035f72b6dfe4 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 29 Oct 2021 04:16:24 +0300 Subject: [PATCH 8/9] Added s390x for Alpine --- .github/workflows/images_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index b67f1c404..bffc3dde9 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -96,7 +96,7 @@ jobs: echo "::set-output name=is_default_branch::$result" build_base: - timeout-minutes: 90 + timeout-minutes: 30 name: Build base on ${{ matrix.os }} needs: init_build strategy: @@ -173,7 +173,7 @@ jobs: if-no-files-found: error build_base_database: - timeout-minutes: 90 + timeout-minutes: 120 needs: [ "build_base", "init_build"] name: Build ${{ matrix.build }} base on ${{ matrix.os }} strategy: @@ -264,7 +264,7 @@ jobs: if-no-files-found: error build_images: - timeout-minutes: 90 + timeout-minutes: 60 needs: [ "build_base_database", "init_build"] name: Build ${{ matrix.build }} on ${{ matrix.os }} strategy: From f63ebbdef8e680d6feda9c1d11a0c265d5fb01a5 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 29 Oct 2021 19:11:31 +0300 Subject: [PATCH 9/9] Added s390x for Alpine --- .github/workflows/images_build.yml | 2 +- Dockerfiles/build-mysql/rhel/Dockerfile | 15 ++++++++++++++- Dockerfiles/build-sqlite3/rhel/Dockerfile | 15 ++++++++++++++- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index bffc3dde9..d996d36f5 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -264,7 +264,7 @@ jobs: if-no-files-found: error build_images: - timeout-minutes: 60 + timeout-minutes: 90 needs: [ "build_base_database", "init_build"] name: Build ${{ matrix.build }} on ${{ matrix.os }} strategy: diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index a3cf5d02b..e65e9353d 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -30,6 +30,19 @@ LABEL description="Zabbix build base for MySQL based images" \ org.label-schema.vendor="Zabbix LLC" 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 master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -47,7 +60,6 @@ RUN set -eux && \ --enable-ipv6 \ --enable-agent \ --enable-agent2 \ - --enable-java \ --enable-proxy \ --enable-server \ --enable-webservice \ @@ -61,6 +73,7 @@ RUN set -eux && \ --with-openssl \ --with-ssh \ --with-unixodbc \ + $additional_components \ --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 6e19eb131..38a220b3e 100644 --- a/Dockerfiles/build-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile @@ -30,6 +30,19 @@ LABEL description="Zabbix build base for SQLite3 based images" \ org.label-schema.vendor="Zabbix LLC" 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 master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ @@ -47,7 +60,6 @@ RUN set -eux && \ --enable-agent \ --enable-agent2 \ --enable-ipv6 \ - --enable-java \ --enable-proxy \ --with-ldap \ --with-libcurl \ @@ -59,6 +71,7 @@ RUN set -eux && \ --with-sqlite3 \ --with-ssh \ --with-unixodbc \ + $additional_components \ --silent && \ make -j"$(nproc)" -s dbschema && \ make -j"$(nproc)" -s && \