-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
63 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \ | ||
|
@@ -24,6 +25,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=mysql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -63,16 +65,15 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
--prefix=/usr \ | ||
--sysconfdir=/etc/zabbix \ | ||
--enable-ipv6 \ | ||
--enable-agent \ | ||
--enable-agent2 \ | ||
--enable-ipv6 \ | ||
--enable-java \ | ||
--enable-proxy \ | ||
--enable-server \ | ||
--enable-webservice \ | ||
|
@@ -87,7 +88,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-openssl \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--enable-java \ | ||
--silent && \ | ||
make -j"$(nproc)" -s dbschema && \ | ||
make -j"$(nproc)" -s && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \ | ||
|
@@ -24,6 +25,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=mysql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -63,8 +65,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
|
@@ -73,6 +73,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--enable-ipv6 \ | ||
--enable-agent \ | ||
--enable-agent2 \ | ||
--enable-java \ | ||
--enable-proxy \ | ||
--enable-server \ | ||
--enable-webservice \ | ||
|
@@ -87,7 +88,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-openssl \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--enable-java \ | ||
--silent && \ | ||
make -j"$(nproc)" -s dbschema && \ | ||
make -j"$(nproc)" -s && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,9 @@ ARG ZBX_VERSION | |
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | ||
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \ | ||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ | ||
|
@@ -22,9 +25,10 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=mysql \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
||
RUN --mount=type=cache,target=/root/.cache/go-build/ \ | ||
--mount=type=cache,target=/root/go/ \ | ||
|
@@ -61,8 +65,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL description="Zabbix build base for MySQL based images" \ | ||
maintainer="[email protected]" \ | ||
|
@@ -34,6 +35,7 @@ LABEL description="Zabbix build base for MySQL based images" \ | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=mysql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -73,8 +75,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
|
@@ -83,6 +83,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--enable-ipv6 \ | ||
--enable-agent \ | ||
--enable-agent2 \ | ||
--enable-java \ | ||
--enable-proxy \ | ||
--enable-server \ | ||
--enable-webservice \ | ||
|
@@ -97,7 +98,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-openssl \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--enable-java \ | ||
--silent && \ | ||
make -j"$(nproc)" -s dbschema && \ | ||
make -j"$(nproc)" -s && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \ | ||
|
@@ -24,6 +25,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=mysql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -63,8 +65,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
|
@@ -73,6 +73,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--enable-ipv6 \ | ||
--enable-agent \ | ||
--enable-agent2 \ | ||
--enable-java \ | ||
--enable-proxy \ | ||
--enable-server \ | ||
--enable-webservice \ | ||
|
@@ -87,7 +88,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-openssl \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--enable-java \ | ||
--silent && \ | ||
make -j"$(nproc)" -s dbschema && \ | ||
make -j"$(nproc)" -s && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ | ||
|
@@ -24,6 +25,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=postgresql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -65,16 +67,15 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
--prefix=/usr \ | ||
--sysconfdir=/etc/zabbix \ | ||
--enable-ipv6 \ | ||
--enable-agent \ | ||
--enable-agent2 \ | ||
--enable-ipv6 \ | ||
--enable-java \ | ||
--enable-proxy \ | ||
--enable-server \ | ||
--enable-webservice \ | ||
|
@@ -83,13 +84,12 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-libmodbus \ | ||
--with-libpcre2 \ | ||
--with-libxml2 \ | ||
--with-${DB_TYPE} \ | ||
--with-net-snmp \ | ||
--with-openipmi \ | ||
--with-openssl \ | ||
--with-${DB_TYPE} \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--enable-java \ | ||
--silent && \ | ||
make -j"$(nproc)" -s dbschema && \ | ||
make -j"$(nproc)" -s && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ | ||
|
@@ -24,6 +25,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=postgresql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -65,8 +67,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
|
@@ -83,13 +83,12 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-libmodbus \ | ||
--with-libpcre2 \ | ||
--with-libxml2 \ | ||
--with-${DB_TYPE} \ | ||
--with-net-snmp \ | ||
--with-openipmi \ | ||
--with-openssl \ | ||
--with-${DB_TYPE} \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--enable-java \ | ||
--silent && \ | ||
make -j"$(nproc)" -s dbschema && \ | ||
make -j"$(nproc)" -s && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <[email protected]>" \ | ||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \ | ||
|
@@ -24,6 +25,7 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=postgresql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -65,8 +67,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
|
@@ -84,10 +84,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-libmodbus \ | ||
--with-libpcre2 \ | ||
--with-libxml2 \ | ||
--with-${DB_TYPE} \ | ||
--with-net-snmp \ | ||
--with-openipmi \ | ||
--with-openssl \ | ||
--with-${DB_TYPE} \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--silent && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git | |
ARG GIT_BRANCH | ||
|
||
ARG ZBX_PLUGINS_VERSION=${GIT_BRANCH:-$ZBX_VERSION} | ||
ARG CFLAGS | ||
|
||
LABEL description="Zabbix build base for PostgreSQL based images" \ | ||
maintainer="[email protected]" \ | ||
|
@@ -34,6 +35,7 @@ LABEL description="Zabbix build base for PostgreSQL based images" \ | |
|
||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \ | ||
DB_TYPE=postgresql \ | ||
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"} \ | ||
MONGODB_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mongodb.git MONGODB_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
POSTGRESQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/postgresql.git POSTGRESQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} \ | ||
MSSQL_PLUGIN_SOURCES=https://git.zabbix.com/scm/ap/mssql.git MSSQL_PLUGIN_VERSION=${ZBX_PLUGINS_VERSION} | ||
|
@@ -75,16 +77,14 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \ | ||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ | ||
./bootstrap.sh && \ | ||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \ | ||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \ | ||
./configure \ | ||
--datadir=/usr/lib \ | ||
--libdir=/usr/lib/zabbix \ | ||
--prefix=/usr \ | ||
--sysconfdir=/etc/zabbix \ | ||
--enable-ipv6 \ | ||
--enable-agent \ | ||
--enable-agent2 \ | ||
--enable-ipv6 \ | ||
--enable-java \ | ||
--enable-proxy \ | ||
--enable-server \ | ||
|
@@ -94,10 +94,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ | |
--with-libmodbus \ | ||
--with-libpcre2 \ | ||
--with-libxml2 \ | ||
--with-${DB_TYPE} \ | ||
--with-net-snmp \ | ||
--with-openipmi \ | ||
--with-openssl \ | ||
--with-${DB_TYPE} \ | ||
--with-ssh \ | ||
--with-unixodbc \ | ||
--silent && \ | ||
|
Oops, something went wrong.