Merge branch 'trunk' of https://github.com/zabbix/zabbix-docker into trunk

2024-11-22 07:43:47 +01:00 · 2021-09-17 23:36:08 +03:00 · 2021-09-17 23:36:08 +03:00 · 52f179fd46
commit 52f179fd46
parent cb2d65a8b2 f7f3f5ded4
10 changed files with 2 additions and 17 deletions
--- a/Dockerfiles/build-sqlite3/alpine/build.sh
+++ b/Dockerfiles/build-sqlite3/alpine/build.sh
@ -1 +1 @@
-../../build.sh
+../../../build.sh
--- a/Dockerfiles/build-sqlite3/ubuntu/build.sh
+++ b/Dockerfiles/build-sqlite3/ubuntu/build.sh
@ -1 +1 @@
-../../build.sh
+../../../build.sh
--- a/Dockerfiles/proxy-mysql/alpine/Dockerfile
+++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile
@ -72,8 +72,6 @@ RUN set -eux && \
            openipmi-libs \
            pcre \
            unixodbc \
-#           Temporary!!
-            libmodbus \
            fping && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@ -71,8 +71,6 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
-#            Temporary!
-            libmodbus5 \
            mysql-client \
            snmp-mibs-downloader \
            unixodbc && \
--- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
@ -67,8 +67,6 @@ RUN set -eux && \
            libxml2 \
            net-snmp-agent-libs \
            openipmi-libs \
-#           Temporary!
-            libmodbus \
            pcre \
            sqlite-libs \
            unixodbc && \
--- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@ -69,8 +69,6 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
-#            Temporary!
-            libmodbus5 \
            snmp-mibs-downloader \
            unixodbc && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
--- a/Dockerfiles/server-mysql/alpine/Dockerfile
+++ b/Dockerfiles/server-mysql/alpine/Dockerfile
@ -69,7 +69,6 @@ RUN set -eux && \
            libcurl \
            libevent \
            libldap \
-            libmodbus \
            libssh \
            libxml2 \
            mariadb-client \
--- a/Dockerfiles/server-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@ -76,8 +76,6 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
-#            Temporary!
-            libmodbus5 \
            mysql-client \
            snmp-mibs-downloader \
            unixodbc && \
--- a/Dockerfiles/server-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/server-pgsql/alpine/Dockerfile
@ -75,8 +75,6 @@ RUN set -eux && \
            net-snmp-agent-libs \
            openipmi-libs \
            pcre \
-#           Termporay!
-            libmodbus \
            postgresql-client \
            postgresql-libs \
            unixodbc && \
--- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@ -77,8 +77,6 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
-#            Temporary!
-            libmodbus5 \
            postgresql-client \
            snmp-mibs-downloader \
            unixodbc && \