From c08e3e542708845ceeee3b137754ef00509c81fb Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 12 Oct 2021 15:56:07 +0200 Subject: [PATCH] Cosmetic changes --- Dockerfiles/build-base/centos/Dockerfile | 5 ++++- Dockerfiles/build-base/ol/Dockerfile | 5 ++++- Dockerfiles/build-mysql/alpine/Dockerfile | 3 ++- Dockerfiles/build-mysql/centos/Dockerfile | 3 ++- Dockerfiles/build-mysql/ol/Dockerfile | 3 ++- Dockerfiles/build-mysql/ubuntu/Dockerfile | 4 +--- Dockerfiles/build-pgsql/alpine/Dockerfile | 3 ++- Dockerfiles/build-pgsql/centos/Dockerfile | 3 ++- Dockerfiles/build-pgsql/ol/Dockerfile | 3 ++- Dockerfiles/build-pgsql/ubuntu/Dockerfile | 4 +--- Dockerfiles/build-sqlite3/alpine/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/centos/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/ol/Dockerfile | 3 ++- Dockerfiles/build-sqlite3/ubuntu/Dockerfile | 6 ++---- Dockerfiles/snmptraps/ol/Dockerfile | 6 +++--- Dockerfiles/snmptraps/ubuntu/Dockerfile | 8 +++++--- 16 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index b2ea6ae24..4d027c398 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -74,4 +74,7 @@ RUN set -eux && \ gpgconf --kill all && \ rm -rf "$GNUPGHOME" go.tgz.asc && \ tar -C /usr/local -xzf go.tgz && \ - rm go.tgz + rm go.tgz && \ + microdnf -y clean all && \ + rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ + rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index ba2cb4786..8114050e9 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -73,4 +73,7 @@ RUN set -eux && \ gpgconf --kill all && \ rm -rf "$GNUPGHOME" go.tgz.asc && \ tar -C /usr/local -xzf go.tgz && \ - rm go.tgz + rm go.tgz && \ + microdnf -y clean all && \ + rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ + rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile index 4901864b6..d84977afe 100644 --- a/Dockerfiles/build-mysql/alpine/Dockerfile +++ b/Dockerfiles/build-mysql/alpine/Dockerfile @@ -68,4 +68,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index 7a5d6e0ec..2ce944340 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -67,4 +67,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile index 44d6cc9ec..a46689f60 100644 --- a/Dockerfiles/build-mysql/ol/Dockerfile +++ b/Dockerfiles/build-mysql/ol/Dockerfile @@ -67,4 +67,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile index 5f17239de..a4a9a4686 100644 --- a/Dockerfiles/build-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile @@ -69,6 +69,4 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ - apt-get -y autoremove && \ - apt-get -y clean && \ - rm -rf /var/lib/apt/lists/* + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile index 20fa32909..55f3e06e7 100644 --- a/Dockerfiles/build-pgsql/alpine/Dockerfile +++ b/Dockerfiles/build-pgsql/alpine/Dockerfile @@ -68,4 +68,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index be89c2bc0..519aa99c1 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -68,4 +68,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile index 79d9fe4dd..038e52a01 100644 --- a/Dockerfiles/build-pgsql/ol/Dockerfile +++ b/Dockerfiles/build-pgsql/ol/Dockerfile @@ -68,4 +68,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile index 62d0cb012..ca6c2b0ad 100644 --- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile @@ -69,6 +69,4 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ - apt-get -y autoremove && \ - apt-get -y clean && \ - rm -rf /var/lib/apt/lists/* + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile index 4fb1b0a9b..8beb5149c 100644 --- a/Dockerfiles/build-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile @@ -56,4 +56,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index 5a5f93d84..2bad8d457 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -55,4 +55,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender \ No newline at end of file + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile index 78fac1f6b..51b4c1e36 100644 --- a/Dockerfiles/build-sqlite3/ol/Dockerfile +++ b/Dockerfiles/build-sqlite3/ol/Dockerfile @@ -55,4 +55,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender \ No newline at end of file + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile index 7ecd2ce27..04fc1cbd9 100644 --- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile @@ -56,7 +56,5 @@ RUN set -eux && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \ strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \ strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \ - strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ - apt-get -y autoremove && \ - apt-get -y clean && \ - rm -rf /var/lib/apt/lists/* + strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender && \ + strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service diff --git a/Dockerfiles/snmptraps/ol/Dockerfile b/Dockerfiles/snmptraps/ol/Dockerfile index 4fc6ef8d8..ebf03048e 100644 --- a/Dockerfiles/snmptraps/ol/Dockerfile +++ b/Dockerfiles/snmptraps/ol/Dockerfile @@ -20,9 +20,6 @@ LABEL org.opencontainers.image.title="zabbix-snmptraps-ol" \ STOPSIGNAL SIGTERM RUN set -eux && \ - INSTALL_PKGS="bash \ - tzdata \ - net-snmp" && \ groupadd --system --gid 1995 zabbix && \ useradd \ --system --comment "Zabbix monitoring system" \ @@ -31,6 +28,9 @@ RUN set -eux && \ --shell /sbin/nologin \ --home-dir /var/lib/zabbix/ \ zabbix && \ + INSTALL_PKGS="bash \ + tzdata \ + net-snmp" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index bb470cef6..08b117fc2 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -30,10 +30,12 @@ RUN set -eux && \ --home-dir /var/lib/zabbix/ \ zabbix && \ apt-get -y update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ - tzdata \ + INSTALL_PKGS="tzdata \ snmp-mibs-downloader \ - snmptrapd && \ + snmptrapd" && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + --no-install-recommends install \ + ${INSTALL_PKGS} && \ download-mibs && \ mkdir -p /var/lib/zabbix && \ mkdir -p /var/lib/zabbix/snmptraps && \