Merge branch 'master' into 4.2

iLychevAD · Apr 12, 2019 · c91cb49 · c91cb49
2 parents a3d956d + 3e8d001
commit c91cb49
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
@@ -62,6 +62,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             libxml2 \
             mysql-client \
             snmp-mibs-downloader \
+            ca-certificates \
             unixodbc && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
@@ -59,6 +59,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             libssl1.1 \
             libxml2 \
             snmp-mibs-downloader \
+            ca-certificates \
             unixodbc && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
@@ -66,6 +66,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             libxml2 \
             mysql-client \
             snmp-mibs-downloader \
+            ca-certificates \
             unixodbc && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
@@ -66,6 +66,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             libxml2 \
             postgresql-client \
             snmp-mibs-downloader \
+            ca-certificates \
             unixodbc && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
     apt-get ${APT_FLAGS_COMMON} clean && \

diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile
@@ -189,6 +189,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             snmp-mibs-downloader \
             supervisor \
             ttf-dejavu-core \
+            ca-certificates \
             unixodbc && \
     update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \
             zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \