mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-10 00:47:51 +02:00
Updated all Dockerfiles to make consistency
This commit is contained in:
@ -1,14 +1,13 @@
|
||||
FROM centos:centos7 as builder
|
||||
|
||||
ARG YUM_FLAGS_COMMON="--quiet -y"
|
||||
ARG YUM_FLAGS_COMMON="-y"
|
||||
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
||||
|
||||
ARG MAJOR_VERSION=3.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.17
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV TERM=xterm \
|
||||
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
|
||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
ZBX_TYPE=java-gateway
|
||||
|
||||
RUN yum --quiet makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install \
|
||||
@ -19,12 +18,12 @@ RUN yum --quiet makecache && \
|
||||
subversion \
|
||||
gcc && \
|
||||
cd /tmp/ && \
|
||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
|
||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
||||
cd /tmp/zabbix-${ZBX_VERSION} && \
|
||||
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||
zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \
|
||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||
./bootstrap.sh 1>/dev/null && \
|
||||
./bootstrap.sh && \
|
||||
./configure \
|
||||
--datadir=/usr/lib \
|
||||
--libdir=/usr/lib/zabbix \
|
||||
@ -32,7 +31,7 @@ RUN yum --quiet makecache && \
|
||||
--prefix=/usr \
|
||||
--enable-java \
|
||||
--silent && \
|
||||
make -j"$(nproc)" -s 1>/dev/null && \
|
||||
make -j"$(nproc)" -s && \
|
||||
rm -rf src/zabbix_java/lib/*.xml
|
||||
|
||||
FROM centos:centos7
|
||||
@ -41,13 +40,13 @@ LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
|
||||
ARG BUILD_DATE
|
||||
ARG VCS_REF
|
||||
|
||||
ARG YUM_FLAGS_COMMON="--quiet -y"
|
||||
ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}"
|
||||
ARG YUM_FLAGS_COMMON="-y"
|
||||
ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
||||
|
||||
ARG MAJOR_VERSION=3.0
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.17
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
ENV TERM=xterm \
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||
|
||||
LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
|
||||
@ -57,7 +56,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
|
||||
org.label-schema.vcs-ref="${VCS_REF}" \
|
||||
org.label-schema.build-date="${BUILD_DATE}" \
|
||||
org.label-schema.schema-version="1.0" \
|
||||
org.label-schema.license="GPL 2.0" \
|
||||
org.label-schema.license="GPL v2.0" \
|
||||
org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||
org.label-schema.version="${ZBX_VERSION}" \
|
||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||
@ -65,6 +64,9 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
|
||||
|
||||
STOPSIGNAL SIGTERM
|
||||
|
||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/* /usr/sbin/zabbix_java/bin/
|
||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/* /usr/sbin/zabbix_java/lib/
|
||||
|
||||
RUN groupadd --system zabbix && \
|
||||
adduser --system --shell /sbin/nologin \
|
||||
-g zabbix \
|
||||
@ -74,14 +76,11 @@ RUN groupadd --system zabbix && \
|
||||
chown --quiet -R zabbix:root /etc/zabbix && \
|
||||
mkdir -p /usr/sbin/zabbix_java/ && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_PERSISTANT} install \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||
java-1.8.0-openjdk-headless && \
|
||||
yum ${YUM_FLAGS_PERSISTANT} clean all && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} clean all && \
|
||||
rm -rf /var/cache/yum/
|
||||
|
||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/* /usr/sbin/zabbix_java/bin/
|
||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/* /usr/sbin/zabbix_java/lib/
|
||||
|
||||
EXPOSE 10052/TCP
|
||||
|
||||
WORKDIR /var/lib/zabbix
|
||||
|
Reference in New Issue
Block a user