diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 5d9e74ff4..93eddccfd 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -1,13 +1,13 @@ FROM alpine:3.4 as builder -ARG APK_FLAGS_COMMON="-q" +ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ - ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ + ZBX_TYPE=agent RUN apk update && \ apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ @@ -20,11 +20,11 @@ RUN apk update && \ subversion \ coreutils && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -37,7 +37,7 @@ RUN apk update && \ --with-openssl \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s 1>/dev/null + make -j"$(nproc)" -s FROM alpine:3.4 LABEL maintainer="Alexey Pustovalov " @@ -45,13 +45,13 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-alpine" \ @@ -61,7 +61,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-alpine" \ 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}" \ @@ -69,6 +69,11 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-alpine" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf + RUN addgroup zabbix && \ adduser -S \ -D -G zabbix \ @@ -88,11 +93,6 @@ RUN addgroup zabbix && \ pcre && \ rm -rf /var/cache/apk/* -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf - EXPOSE 10050/TCP WORKDIR /var/lib/zabbix diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 77b27c54a..01267d11b 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -1,13 +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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ + ZBX_TYPE=agent RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ @@ -19,11 +19,11 @@ 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=`set -o pipefail && svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`set -o pipefail && svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -36,7 +36,7 @@ RUN yum --quiet makecache && \ --with-openssl \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s 1>/dev/null + make -j"$(nproc)" -s FROM centos:centos7 LABEL maintainer="Alexey Pustovalov " @@ -44,15 +44,14 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} -ENV TERM=xterm \ - ZBX_TYPE=agent 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=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \ org.label-schema.vendor="Zabbix LLC" \ @@ -69,6 +68,11 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf + RUN groupadd --system zabbix && \ adduser -r --shell /sbin/nologin \ -g zabbix \ @@ -81,17 +85,12 @@ RUN groupadd --system zabbix && \ mkdir -p /var/lib/zabbix/modules && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install \ libldap \ openssl-libs && \ - 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_agent/zabbix_agentd /usr/sbin/zabbix_agentd -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf - EXPOSE 10050/TCP WORKDIR /var/lib/zabbix diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 6c6273ed1..a6a507bf9 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -1,12 +1,13 @@ FROM ubuntu:trusty as builder -ARG APT_FLAGS_COMMON="-qq -y" +ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ - ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} + ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ @@ -20,13 +21,13 @@ RUN locale-gen $LC_ALL && \ make \ pkg-config \ subversion \ - gcc 1>/dev/null && \ + gcc && \ cd /tmp/ && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -38,7 +39,7 @@ RUN locale-gen $LC_ALL && \ --with-openssl \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s 1>/dev/null + make -j"$(nproc)" -s FROM ubuntu:trusty LABEL maintainer="Alexey Pustovalov " @@ -46,8 +47,9 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -62,7 +64,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-ubuntu" \ 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}" \ @@ -70,6 +72,11 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-ubuntu" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf + RUN locale-gen $LC_ALL && \ echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ addgroup --system --quiet zabbix && \ @@ -87,16 +94,11 @@ RUN locale-gen $LC_ALL && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_PERSISTANT} install \ libpcre3 \ - libldap-2.4 1>/dev/null && \ + libldap-2.4 && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf - EXPOSE 10050/TCP WORKDIR /var/lib/zabbix diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index 227c0e9fe..5546ef539 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -52,12 +52,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ subversion \ alpine-sdk && \ 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 \ @@ -65,7 +65,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --prefix=/usr \ --enable-java \ --silent && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s && \ mkdir -p /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index 1aa5d3767..8d6008a10 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 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 " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 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 diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index c6507cc52..9ed952928 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none @@ -33,8 +33,8 @@ RUN locale-gen $LC_ALL && \ mkdir -p /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ - openjdk-7-jre-headless 1>/dev/null && \ + apt-get ${APT_FLAGS_PERSISTENT} install \ + openjdk-7-jre-headless && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -58,14 +58,14 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ openjdk-7-jdk \ pkg-config \ subversion \ - gcc 1>/dev/null && \ + 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 \ @@ -73,7 +73,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --prefix=/usr \ --enable-java \ --silent && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s && \ mkdir -p /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ @@ -88,7 +88,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ openjdk-7-jdk \ pkg-config \ subversion \ - gcc 1>/dev/null && \ + gcc && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 6aab197b6..b0bbab29c 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -41,7 +41,7 @@ RUN addgroup zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ iputils \ libcurl \ @@ -85,11 +85,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ unixodbc-dev \ alpine-sdk && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -109,8 +109,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 8717e9258..98f495273 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -1,13 +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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none + ZBX_TYPE=proxy ZBX_DB_TYPE=mysql RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ @@ -26,11 +26,11 @@ RUN yum --quiet makecache && \ subversion \ unixODBC-devel && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -50,8 +50,8 @@ RUN yum --quiet makecache && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ gzip database/${ZBX_DB_TYPE}/create.sql @@ -61,13 +61,14 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ +ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ + ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \ @@ -77,7 +78,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_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}" \ @@ -85,6 +86,12 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz + RUN groupadd --system zabbix && \ adduser -r --shell /sbin/nologin \ -g zabbix \ @@ -105,7 +112,7 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install \ fping \ libcurl \ libevent \ @@ -120,12 +127,6 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz - EXPOSE 10051/TCP WORKDIR /var/lib/zabbix diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 8363a91df..dca295a15 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ARG DB_TYPE=mysql ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ @@ -19,7 +19,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -48,7 +48,7 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ libcurl3 \ libevent-2.0 \ @@ -61,7 +61,7 @@ RUN locale-gen $LC_ALL && \ libxml2 \ mysql-client \ snmp-mibs-downloader \ - unixodbc 1>/dev/null && \ + unixodbc && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -94,13 +94,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ + unixodbc-dev && \ cd /tmp/ && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -120,8 +120,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ @@ -149,8 +149,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ - apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ + unixodbc-dev && \ + apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /root/.subversion diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index b87624405..98df5bb00 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VCS_REF ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -40,7 +40,7 @@ RUN addgroup zabbix && \ mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ fping \ iputils \ @@ -83,11 +83,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ subversion \ unixodbc-dev && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -107,8 +107,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 59bb03e8c..ea0e208ad 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -1,13 +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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none + ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ @@ -26,11 +26,11 @@ RUN yum --quiet makecache && \ subversion \ unixODBC-devel && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -50,8 +50,8 @@ RUN yum --quiet makecache && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ gzip database/${ZBX_DB_TYPE}/create.sql @@ -61,13 +61,14 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ +ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ + ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \ @@ -77,7 +78,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_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}" \ @@ -85,6 +86,12 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz + RUN groupadd --system zabbix && \ adduser -r --shell /sbin/nologin \ -g zabbix \ @@ -105,7 +112,7 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install \ fping \ libcurl \ libevent \ @@ -116,15 +123,9 @@ RUN groupadd --system zabbix && \ openssl-libs \ pcre \ unixODBC && \ - 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_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz - EXPOSE 10051/TCP WORKDIR /var/lib/zabbix diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 468bb80b2..479346b5b 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ MIBDIRS=/var/lib/mibs/iana:/var/lib/mibs/ietf:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ @@ -46,7 +46,7 @@ RUN locale-gen $LC_ALL && \ mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ libcurl3 \ libevent-2.0 \ @@ -58,7 +58,7 @@ RUN locale-gen $LC_ALL && \ libssl1.0.0 \ libxml2 \ snmp-mibs-downloader \ - unixodbc 1>/dev/null && \ + unixodbc && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -91,13 +91,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ + unixodbc-dev && \ cd /tmp/ && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -117,8 +117,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ @@ -143,8 +143,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ - apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ + unixodbc-dev && \ + apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /root/.subversion diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 9d1ee17bb..8989a0960 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ fping \ iputils \ @@ -87,11 +87,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ subversion \ unixodbc-dev && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -113,8 +113,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 54265674a..8f8b38037 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -1,6 +1,6 @@ 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.4 @@ -28,11 +28,11 @@ RUN yum --quiet makecache && \ subversion \ unixODBC-devel && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -53,8 +53,8 @@ RUN yum --quiet makecache && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \ @@ -66,8 +66,9 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -82,7 +83,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_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}" \ @@ -90,6 +91,12 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz + RUN groupadd --system zabbix && \ adduser -r --shell /sbin/nologin \ -g zabbix -G dialout \ @@ -111,8 +118,8 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install \ fping \ iksemel \ libcurl \ @@ -125,15 +132,9 @@ RUN groupadd --system zabbix && \ openssl-libs \ pcre \ unixODBC && \ - 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_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz - EXPOSE 10051/TCP WORKDIR /var/lib/zabbix diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index 88618c711..2446d2158 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ MIBDIRS=/var/lib/mibs/iana:/var/lib/mibs/ietf:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ @@ -18,7 +18,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ libcurl3 \ libevent-2.0 \ @@ -63,7 +63,7 @@ RUN locale-gen $LC_ALL && \ libxml2 \ mysql-client \ snmp-mibs-downloader \ - unixodbc 1>/dev/null && \ + unixodbc && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -97,13 +97,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ + unixodbc-dev && \ cd /tmp/ && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -124,8 +124,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ @@ -156,8 +156,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ - apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ + unixodbc-dev && \ + apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /root/.subversion diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 105392c91..eae200f15 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -43,7 +43,7 @@ RUN addgroup zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ fping \ iputils \ @@ -87,11 +87,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ subversion \ unixodbc-dev && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -113,8 +113,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index d072be6c3..e885c0944 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -1,6 +1,6 @@ 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.4 @@ -28,11 +28,11 @@ RUN yum --quiet makecache && \ subversion \ unixODBC-devel && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -53,8 +53,8 @@ RUN yum --quiet makecache && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \ @@ -66,9 +66,9 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG YUM_FLAGS_COMMON="--quiet -y" -ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}" -ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" +ARG YUM_FLAGS_COMMON="-y" +ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -83,7 +83,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_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}" \ @@ -91,6 +91,12 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \ STOPSIGNAL SIGTERM +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf +COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz + RUN groupadd --system zabbix && \ adduser -r --shell /sbin/nologin \ -g zabbix -G dialout \ @@ -112,8 +118,8 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install \ fping \ iksemel \ libcurl \ @@ -127,15 +133,9 @@ RUN groupadd --system zabbix && \ postgresql \ postgresql-libs \ unixODBC && \ - 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_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf -COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz - EXPOSE 10051/TCP WORKDIR /var/lib/zabbix diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index a45a9b856..b98b842cf 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ MIBDIRS=/var/lib/mibs/iana:/var/lib/mibs/ietf:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ @@ -18,7 +18,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -49,7 +49,7 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ libcurl3 \ libevent-2.0 \ @@ -63,7 +63,7 @@ RUN locale-gen $LC_ALL && \ libxml2 \ postgresql-client \ snmp-mibs-downloader \ - unixodbc 1>/dev/null && \ + unixodbc && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -97,13 +97,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ + unixodbc-dev && \ cd /tmp/ && \ 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 && \ - ./bootstrap.sh 1>/dev/null && \ + ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -124,8 +124,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ @@ -156,8 +156,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ - apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ + unixodbc-dev && \ + apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* EXPOSE 10051/TCP diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index 0cfde99f1..4488729f8 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL @@ -16,7 +16,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \ 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" ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 @@ -38,7 +38,7 @@ RUN addgroup zabbix && \ -h /var/lib/zabbix/ \ zabbix && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ net-snmp \ supervisor && \ apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ @@ -56,7 +56,7 @@ RUN addgroup zabbix && \ ls -lah && \ cd /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \ patch -p1 < ./patches/makefile.patch && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s && \ cp snmptrapfmthdlr /usr/sbin/snmptrapfmthdlr && \ cp snmptrapfmt /usr/sbin/snmptrapfmt && \ cp snmptrapfmt.conf /etc/snmp/snmptrapfmt.conf && \ @@ -67,8 +67,8 @@ RUN addgroup zabbix && \ -e '/^LOGFMT=/s/=.*/=\"$x ZBXTRAP $R $G $S $e $*\"/' \ -e "/^LOGFILE=/s/=.*/=\"\/var\/lib\/zabbix\/snmptraps\/snmptraps.log\"/" \ "/etc/snmp/snmptrapfmt.conf" && \ - rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2.tar.gz 1>/dev/null && \ - rm -rf /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ 1>/dev/null && \ + rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \ + rm -rf /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index 2e21be70f..db66942f0 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -1,6 +1,6 @@ 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.4 @@ -23,7 +23,7 @@ RUN yum ${YUM_FLAGS_COMMON} makecache && \ tar -zxf snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \ cd /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \ patch -p1 < ./patches/makefile.patch && \ - make -j"$(nproc)" -s 1>/dev/null + make -j"$(nproc)" -s FROM centos:centos7 LABEL maintainer "Alexey Pustovalov " @@ -31,8 +31,9 @@ LABEL maintainer "Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -46,7 +47,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-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="1.14" \ org.label-schema.vcs-url="https://anonscm.debian.org/gitweb/?p=collab-maint/snmptrapfmt.git" \ @@ -64,8 +65,8 @@ RUN groupadd --system zabbix && \ -d /var/lib/zabbix/ \ zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install \ net-snmp \ supervisor && \ mkdir -p /var/lib/zabbix && \ diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index 4725049d4..c504af8ae 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer "Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ MIBDIRS=/var/lib/mibs/iana:/var/lib/mibs/ietf:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \ 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" ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 @@ -44,11 +44,11 @@ RUN locale-gen $LC_ALL && \ --home /var/lib/zabbix/ \ zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ snmp-mibs-downloader \ snmpd \ - supervisor 1>/dev/null && \ - download-mibs 1>/dev/null && \ + supervisor && \ + download-mibs && \ dpkg -i /tmp/snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb && \ mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix/snmptraps && \ @@ -64,7 +64,7 @@ RUN locale-gen $LC_ALL && \ rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb && \ apt-get ${APT_FLAGS_COMMON} purge \ snmp-mibs-downloader \ - wget 1>/dev/null && \ + wget && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index a594d86a4..272aa0a84 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VCS_REF ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -31,7 +31,7 @@ RUN addgroup zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ apache2 \ bash \ mariadb-client \ @@ -51,7 +51,7 @@ RUN addgroup zabbix && \ php7-xmlreader \ php7-xmlwriter \ ttf-dejavu && \ - apk add ${APK_FLAGS_PERSISTANT} --no-scripts apache2-ssl && \ + apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 @@ -70,14 +70,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index b21a8d705..c82882bfe 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -1,14 +1,12 @@ 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ - ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} COPY ["conf/tmp/font-config", "/tmp/font-config"] @@ -18,14 +16,14 @@ RUN yum --quiet makecache && \ patch \ subversion && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /tmp/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /tmp/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null + ./locale/make_mo.sh FROM centos:centos7 LABEL maintainer="Alexey Pustovalov " @@ -33,13 +31,13 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \ @@ -68,7 +66,7 @@ RUN groupadd --system zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install \ dejavu-sans-fonts \ httpd \ mariadb \ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 85297d19c..5a7a5cf27 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -34,7 +34,7 @@ RUN locale-gen $LC_ALL && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ apache2 \ libapache2-mod-php5 \ mysql-client \ @@ -42,7 +42,7 @@ RUN locale-gen $LC_ALL && \ php5-json \ php5-ldap \ php5-mysql \ - ttf-dejavu-core 1>/dev/null && \ + ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -63,16 +63,16 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \ mkdir -p /var/lib/locales/supported.d/ && \ @@ -80,13 +80,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales 1>/dev/null && \ + dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index f017fc38f..15bbed0c0 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -31,7 +31,7 @@ RUN addgroup zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ apache2 \ bash \ php7-apache2 \ @@ -50,7 +50,7 @@ RUN addgroup zabbix && \ php7-xmlwriter \ postgresql-client \ ttf-dejavu && \ - apk add ${APK_FLAGS_PERSISTANT} --no-scripts apache2-ssl && \ + apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=3.4 @@ -69,14 +69,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index d736a9dbd..daeab6143 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -1,14 +1,12 @@ 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ - ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} COPY ["conf/tmp/font-config", "/tmp/font-config"] @@ -18,14 +16,14 @@ RUN yum --quiet makecache && \ patch \ subversion && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /tmp/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /tmp/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null + ./locale/make_mo.sh FROM centos:centos7 LABEL maintainer="Alexey Pustovalov " @@ -33,13 +31,13 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \ @@ -68,8 +66,8 @@ RUN groupadd --system zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install \ dejavu-sans-fonts \ httpd \ php \ @@ -81,7 +79,7 @@ RUN groupadd --system zabbix && \ php-xml \ postgresql && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ - yum ${YUM_FLAGS_PERSISTANT} clean all && \ + yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ EXPOSE 80/TCP 443/TCP diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 9cd5311a9..36ca7f694 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -34,7 +34,7 @@ RUN locale-gen $LC_ALL && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ apache2 \ libapache2-mod-php5 \ php5-gd \ @@ -42,7 +42,7 @@ RUN locale-gen $LC_ALL && \ php5-ldap \ php5-pgsql \ postgresql-client \ - ttf-dejavu-core 1>/dev/null && \ + ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -63,16 +63,16 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \ mkdir -p /var/lib/locales/supported.d/ && \ @@ -80,13 +80,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales 1>/dev/null && \ + dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index d59847b6a..a340e6771 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -31,7 +31,7 @@ RUN addgroup zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ mariadb-client \ mariadb-client-libs \ @@ -71,14 +71,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 0c79a5140..0e3739948 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -1,13 +1,12 @@ 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx COPY ["conf/tmp/font-config", "/tmp/font-config"] @@ -18,14 +17,14 @@ RUN yum --quiet makecache && \ patch \ subversion && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /tmp/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /tmp/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null + ./locale/make_mo.sh FROM centos:centos7 LABEL maintainer="Alexey Pustovalov " @@ -33,13 +32,13 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \ @@ -68,8 +67,8 @@ RUN groupadd --system zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install \ dejavu-sans-fonts \ mariadb \ nginx \ @@ -85,7 +84,7 @@ RUN groupadd --system zabbix && \ rm -f /etc/php-fpm.d/www.conf && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ - yum ${YUM_FLAGS_PERSISTANT} clean all && \ + yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ EXPOSE 80/TCP 443/TCP diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 35fb56a34..de2a63591 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -35,12 +35,12 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /etc/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} install \ - wget 1>/dev/null && \ + wget && \ DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \ echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ mysql-client \ nginx \ php5-fpm \ @@ -49,9 +49,9 @@ RUN locale-gen $LC_ALL && \ php5-ldap \ php5-mysql \ supervisor \ - ttf-dejavu-core 1>/dev/null && \ + ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} purge \ - wget 1>/dev/null && \ + wget && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ mkdir -p /var/lib/php5 && \ @@ -75,16 +75,16 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \ mkdir -p /var/lib/locales/supported.d/ && \ @@ -92,13 +92,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales 1>/dev/null && \ + dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 094f3f9f9..8973cd980 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" ENV TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-alpine" \ 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" STOPSIGNAL SIGTERM @@ -31,7 +31,7 @@ RUN addgroup zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ nginx \ php7-bcmath \ @@ -70,14 +70,14 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index c6c65ebee..c2d2a6666 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -1,13 +1,12 @@ 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx COPY ["conf/tmp/font-config", "/tmp/font-config"] @@ -18,14 +17,14 @@ RUN yum --quiet makecache && \ patch \ subversion && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /tmp/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /tmp/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null + ./locale/make_mo.sh FROM centos:centos7 LABEL maintainer="Alexey Pustovalov " @@ -33,13 +32,13 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ -ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ - TERM=xterm \ +ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \ @@ -68,8 +67,8 @@ RUN groupadd --system zabbix && \ mkdir -p /etc/zabbix/web && \ chown --quiet -R zabbix:root /etc/zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install supervisor \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install supervisor \ dejavu-sans-fonts \ nginx \ postgresql \ @@ -84,7 +83,7 @@ RUN groupadd --system zabbix && \ rm -f /etc/php-fpm.d/www.conf && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ - yum ${YUM_FLAGS_PERSISTANT} clean all && \ + yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ EXPOSE 80/TCP 443/TCP diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 50b52332a..115a9e944 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx @@ -17,7 +17,7 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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" STOPSIGNAL SIGTERM @@ -35,12 +35,12 @@ RUN locale-gen $LC_ALL && \ chown --quiet -R zabbix:root /etc/zabbix && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} install \ - wget 1>/dev/null && \ + wget && \ DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \ echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ nginx \ php5-fpm \ php5-gd \ @@ -49,9 +49,9 @@ RUN locale-gen $LC_ALL && \ php5-pgsql \ postgresql-client \ supervisor \ - ttf-dejavu-core 1>/dev/null && \ + ttf-dejavu-core && \ apt-get ${APT_FLAGS_COMMON} purge \ - wget 1>/dev/null && \ + wget && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ mkdir -p /var/lib/php5 && \ @@ -75,16 +75,16 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \ mkdir -p /var/lib/locales/supported.d/ && \ @@ -92,13 +92,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales 1>/dev/null && \ + dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion 1>/dev/null && \ + subversion && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index e6592194a..8b5504fec 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -1,7 +1,8 @@ FROM alpine:3.4 as builder -ARG APK_FLAGS_COMMON="-q" +ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -32,13 +33,13 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ subversion \ unixodbc-dev && \ 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;}'` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ 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 && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -61,8 +62,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \ @@ -81,8 +82,9 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APK_FLAGS_COMMON="-q" -ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache" +ARG APK_FLAGS_COMMON="" +ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -139,7 +141,7 @@ RUN addgroup zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ apk update && \ - apk add ${APK_FLAGS_PERSISTANT} \ + apk add ${APK_FLAGS_PERSISTENT} \ bash \ fping \ iputils \ diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index 70d4929aa..a569b09e8 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -1,6 +1,6 @@ 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.4 @@ -34,13 +34,13 @@ RUN yum ${YUM_FLAGS_DEV} install epel-release && \ subversion \ unixODBC-devel && \ 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" 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 && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -62,8 +62,8 @@ RUN yum ${YUM_FLAGS_DEV} install epel-release && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \ @@ -74,7 +74,7 @@ RUN yum ${YUM_FLAGS_DEV} install epel-release && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null + ./locale/make_mo.sh FROM centos:centos7 LABEL maintainer="Alexey Pustovalov " @@ -82,8 +82,9 @@ LABEL maintainer="Alexey Pustovalov " 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.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -139,8 +140,8 @@ RUN groupadd --system zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ yum ${YUM_FLAGS_COMMON} makecache && \ - yum ${YUM_FLAGS_PERSISTANT} install epel-release && \ - yum ${YUM_FLAGS_PERSISTANT} install \ + yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ + yum ${YUM_FLAGS_PERSISTENT} install \ OpenIPMI-libs \ dejavu-sans-fonts \ fping \ @@ -170,7 +171,7 @@ RUN groupadd --system zabbix && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ ls -lah /usr/share/zabbix/ && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ - yum ${YUM_FLAGS_PERSISTANT} clean all && \ + yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ EXPOSE 80/TCP 443/TCP 10051/TCP diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 7fc4d345c..c19c325d4 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -1,8 +1,8 @@ FROM registry.access.redhat.com/rhel7 MAINTAINER Alexey Pustovalov -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 YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ @@ -12,8 +12,8 @@ ARG BUILD_DATE ARG VCS_REF ARG MAJOR_VERSION=3.4 -ARG RELEASE=8 -ARG ZBX_VERSION=${MAJOR_VERSION}.9 +ARG RELEASE=9 +ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -38,7 +38,7 @@ LABEL name="zabbix/zabbix-appliance" \ 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}" \ @@ -135,13 +135,13 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte unixODBC-devel" && \ yum -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ 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" 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 && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -163,8 +163,8 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cp src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE} && \ cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ @@ -182,16 +182,16 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \ + svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ cd /usr/share/zabbix/ && \ patch -p3 < /tmp/font-config && \ rm /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null && \ + ./locale/make_mo.sh && \ ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ - yum ${YUM_FLAGS_COMMON} history undo `yum history | sed -n 4p |column -t | cut -d' ' -f1` 1>/dev/null && \ + yum ${YUM_FLAGS_COMMON} history undo `yum history | sed -n 4p |column -t | cut -d' ' -f1` && \ yum ${YUM_FLAGS_COMMON} clean all && \ rm -rf /var/cache/yum && \ rm -rf /var/lib/yum/yumdb/* && \ diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index 3fbbfe152..5f4c321f5 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -1,7 +1,8 @@ FROM ubuntu:trusty as builder -ARG APT_FLAGS_COMMON="-qq -y" +ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" + ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -36,15 +37,15 @@ RUN locale-gen $LC_ALL && \ patch \ pkg-config \ subversion \ - unixodbc-dev 1>/dev/null && \ + unixodbc-dev && \ 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" 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 && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ ./configure \ --datadir=/usr/lib \ @@ -66,8 +67,8 @@ RUN locale-gen $LC_ALL && \ --with-unixodbc \ --enable-ipv6 \ --silent && \ - make -j"$(nproc)" -s dbschema 1>/dev/null && \ - make -j"$(nproc)" -s 1>/dev/null && \ + make -j"$(nproc)" -s dbschema && \ + make -j"$(nproc)" -s && \ cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \ cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \ @@ -78,7 +79,7 @@ RUN locale-gen $LC_ALL && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ - ./locale/make_mo.sh 2>/dev/null + ./locale/make_mo.sh FROM ubuntu:trusty LABEL maintainer="Alexey Pustovalov " @@ -86,8 +87,8 @@ LABEL maintainer="Alexey Pustovalov " ARG BUILD_DATE ARG VCS_REF -ARG APT_FLAGS_COMMON="-qq -y" -ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends" +ARG APT_FLAGS_COMMON="-y" +ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" ARG MAJOR_VERSION=3.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ @@ -104,7 +105,7 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \ 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}" \ @@ -149,12 +150,12 @@ RUN locale-gen $LC_ALL && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} install \ - wget 1>/dev/null && \ + wget && \ DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add - && \ echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-get ${APT_FLAGS_COMMON} update && \ - apt-get ${APT_FLAGS_PERSISTANT} install \ + apt-get ${APT_FLAGS_PERSISTENT} install \ fping \ libcurl3 \ libevent-2.0 \ @@ -178,7 +179,7 @@ RUN locale-gen $LC_ALL && \ snmp-mibs-downloader \ supervisor \ ttf-dejavu-core \ - unixodbc 1>/dev/null && \ + unixodbc && \ update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \ mkdir -p /var/lib/locales/supported.d/ && \ @@ -186,9 +187,9 @@ RUN locale-gen $LC_ALL && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ - dpkg-reconfigure locales 1>/dev/null && \ + dpkg-reconfigure locales && \ apt-get ${APT_FLAGS_COMMON} purge \ - wget 1>/dev/null && \ + wget && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ mkdir -p /var/lib/php5 && \