From c9f95fda05713261bb8c4a28a79ad4911ed79f1b Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 12 Oct 2021 16:50:58 +0200
Subject: [PATCH] Cosmetic changes

---
 Dockerfiles/build-sqlite3/alpine/Dockerfile    | 3 +--
 Dockerfiles/build-sqlite3/centos/Dockerfile    | 3 +--
 Dockerfiles/build-sqlite3/ol/Dockerfile        | 3 +--
 Dockerfiles/build-sqlite3/ubuntu/Dockerfile    | 3 +--
 Dockerfiles/web-apache-mysql/ubuntu/Dockerfile | 5 -----
 Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile | 5 -----
 6 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile
index 8beb5149c..4fb1b0a9b 100644
--- a/Dockerfiles/build-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile
@@ -56,5 +56,4 @@ 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/go/bin/zabbix_web_service
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile
index 2bad8d457..a8e1d8586 100644
--- a/Dockerfiles/build-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/build-sqlite3/centos/Dockerfile
@@ -55,5 +55,4 @@ 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/go/bin/zabbix_web_service
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile
index 51b4c1e36..43b63521b 100644
--- a/Dockerfiles/build-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ol/Dockerfile
@@ -55,5 +55,4 @@ 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/go/bin/zabbix_web_service
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
diff --git a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
index 04fc1cbd9..93010ce7f 100644
--- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
@@ -56,5 +56,4 @@ 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/go/bin/zabbix_web_service
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
index 71d5cf861..1406111ef 100644
--- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
@@ -71,9 +71,6 @@ RUN set -eux && \
     sed -i 's/Listen 443/Listen 8443/g' /etc/apache2/ports.conf && \
     sed -i 's|/var/run/apache2$SUFFIX|/tmp|g' /etc/apache2/envvars && \
     rm -f /var/run/apache2/apache2.pid && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            gettext && \
     cd /usr/share/zabbix/ && \
     rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
     rm -rf tests && \
@@ -96,8 +93,6 @@ RUN set -eux && \
     chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
     chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
     chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            gettext && \
     apt-get -y autoremove && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
index 82b70e5f9..6c36e54d6 100644
--- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
@@ -71,9 +71,6 @@ RUN set -eux && \
     sed -i 's/Listen 443/Listen 8443/g' /etc/apache2/ports.conf && \
     sed -i 's|/var/run/apache2$SUFFIX|/tmp|g' /etc/apache2/envvars && \
     rm -f /var/run/apache2/apache2.pid && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            gettext && \
     cd /usr/share/zabbix/ && \
     rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
     rm -rf tests && \
@@ -96,8 +93,6 @@ RUN set -eux && \
     chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
     chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
     chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            gettext && \
     apt-get -y autoremove && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*