Merge branch 'master' into 4.2

danitfk · Jul 8, 2019 · 1264739 · 1264739
2 parents aa95bce + 9cdf315
commit 1264739
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile
@@ -89,7 +89,6 @@ RUN set -eux && \
     chown --quiet -R www-data:www-data /usr/share/zabbix && \
     DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
             gettext \
-            ca-certificates \
             git && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile
@@ -92,7 +92,6 @@ RUN set -eux && \
     DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
             gettext \
             patch \
-            ca-certificates \
             git && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile
@@ -109,7 +109,6 @@ RUN set -eux && \
     chown --quiet -R www-data:www-data /usr/share/zabbix && \
     DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
             gettext \
-            ca-certificates \
             git && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -109,7 +109,6 @@ RUN set -eux && \
     chown --quiet -R www-data:www-data /usr/share/zabbix && \
     DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
             gettext \
-            ca-certificates \
             git && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \