mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-04 21:50:38 +01:00
Added build arg for CFLAGS
This commit is contained in:
parent
18dc787f34
commit
98381f76d6
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
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" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=mysql
|
DB_TYPE=mysql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -72,16 +75,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--enable-server \
|
--enable-server \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
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" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=mysql
|
DB_TYPE=mysql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -66,8 +69,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
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" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=mysql
|
DB_TYPE=mysql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -53,8 +56,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
|
@ -12,6 +12,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL description="Zabbix build base for MySQL based images" \
|
LABEL description="Zabbix build base for MySQL based images" \
|
||||||
maintainer="alexey.pustovalov@zabbix.com" \
|
maintainer="alexey.pustovalov@zabbix.com" \
|
||||||
name="zabbix/zabbix-build-mysql-50" \
|
name="zabbix/zabbix-build-mysql-50" \
|
||||||
@ -31,7 +33,8 @@ LABEL description="Zabbix build base for MySQL based images" \
|
|||||||
org.label-schema.vendor="Zabbix SIA"
|
org.label-schema.vendor="Zabbix SIA"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=mysql
|
DB_TYPE=mysql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -76,8 +79,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for MySQL based images" \
|
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" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=mysql
|
DB_TYPE=mysql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -72,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=postgresql
|
DB_TYPE=postgresql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -72,25 +75,23 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--enable-server \
|
--enable-server \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-${DB_TYPE} \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=postgresql
|
DB_TYPE=postgresql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -66,8 +69,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
@ -81,10 +82,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
|||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-${DB_TYPE} \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=postgresql
|
DB_TYPE=postgresql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -53,8 +56,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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
@ -69,10 +70,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
|||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-${DB_TYPE} \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
--silent && \
|
--silent && \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
org.opencontainers.image.description="Zabbix build base for PostgreSQL based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=postgresql
|
DB_TYPE=postgresql \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -72,25 +75,23 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--enable-server \
|
--enable-server \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-${DB_TYPE} \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=sqlite3
|
DB_TYPE=sqlite3 \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -68,24 +71,22 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-sqlite3 \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=sqlite3
|
DB_TYPE=sqlite3 \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -62,24 +65,22 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-sqlite3 \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=sqlite3
|
DB_TYPE=sqlite3 \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -49,25 +52,23 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-java \
|
--enable-java \
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-sqlite3 \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
--silent && \
|
--silent && \
|
||||||
|
@ -12,6 +12,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL description="Zabbix build base for SQLite3 based images" \
|
LABEL description="Zabbix build base for SQLite3 based images" \
|
||||||
maintainer="alexey.pustovalov@zabbix.com" \
|
maintainer="alexey.pustovalov@zabbix.com" \
|
||||||
name="zabbix/zabbix-build-sqlite3-50" \
|
name="zabbix/zabbix-build-sqlite3-50" \
|
||||||
@ -31,7 +33,8 @@ LABEL description="Zabbix build base for SQLite3 based images" \
|
|||||||
org.label-schema.vendor="Zabbix SIA"
|
org.label-schema.vendor="Zabbix SIA"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=sqlite3
|
DB_TYPE=sqlite3 \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -72,24 +75,22 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-sqlite3 \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
@ -10,6 +10,8 @@ ARG ZBX_VERSION
|
|||||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ARG GIT_BRANCH
|
ARG GIT_BRANCH
|
||||||
|
|
||||||
|
ARG CFLAGS
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
|
||||||
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
org.opencontainers.image.description="Zabbix build base for SQLite3 based images" \
|
||||||
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -21,7 +23,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
|
|||||||
org.opencontainers.image.version="${ZBX_VERSION}"
|
org.opencontainers.image.version="${ZBX_VERSION}"
|
||||||
|
|
||||||
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_VERSION}-output \
|
||||||
DB_TYPE=sqlite3
|
DB_TYPE=sqlite3 \
|
||||||
|
CFLAGS=${CFLAGS:-"-fPIC -pie -Wl,-z,relro,-z,now,-z,defs -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe"}
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
RUN --mount=type=cache,target=/root/.cache/go-build/ \
|
||||||
--mount=type=cache,target=/root/go/ \
|
--mount=type=cache,target=/root/go/ \
|
||||||
@ -68,24 +71,22 @@ 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/go/pkg/version/version.go && \
|
||||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro,-z,now,-z,defs" && \
|
|
||||||
export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fexceptions -O2 -pipe" && \
|
|
||||||
./configure \
|
./configure \
|
||||||
--datadir=/usr/lib \
|
--datadir=/usr/lib \
|
||||||
--libdir=/usr/lib/zabbix \
|
--libdir=/usr/lib/zabbix \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/zabbix \
|
--sysconfdir=/etc/zabbix \
|
||||||
|
--enable-ipv6 \
|
||||||
--enable-agent \
|
--enable-agent \
|
||||||
--enable-agent2 \
|
--enable-agent2 \
|
||||||
--enable-ipv6 \
|
|
||||||
--enable-proxy \
|
--enable-proxy \
|
||||||
--with-ldap \
|
--with-ldap \
|
||||||
--with-libcurl \
|
--with-libcurl \
|
||||||
--with-libxml2 \
|
--with-libxml2 \
|
||||||
|
--with-${DB_TYPE} \
|
||||||
--with-net-snmp \
|
--with-net-snmp \
|
||||||
--with-openipmi \
|
--with-openipmi \
|
||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-sqlite3 \
|
|
||||||
--with-ssh \
|
--with-ssh \
|
||||||
--with-unixodbc \
|
--with-unixodbc \
|
||||||
$additional_components \
|
$additional_components \
|
||||||
|
Loading…
Reference in New Issue
Block a user