extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-02-16 09:51:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added s390x for Alpine

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-10-29 19:11:31 +03:00
parent 1fa91212a2
commit f63ebbdef8
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/images_build.yml vendored
View File

@ -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:

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

@ -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 && \

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

@ -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 && \