Use c-ares library as DNS resolver

2025-10-14 02:19:17 +08:00 · 2025-10-02 17:45:52 +09:00
parent 15922fd093
commit b318f3d27b
46 changed files with 48 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ zbx_env*/
 .*KEY_FILE
 .*CA_FILE
 Dockerfiles/*/rhel/secrets/*
-sources/*
+sources/*
+.*.orig
+.*.rej
--- a/Dockerfiles/agent/alpine/Dockerfile
+++ b/Dockerfiles/agent/alpine/Dockerfile
@@ -41,6 +41,7 @@ RUN set -eux && \
            tzdata \
            coreutils \
            iputils \
+            c-ares \
            pcre2 \
            libgcc \
            libcurl \
--- a/Dockerfiles/agent/centos/Dockerfile
+++ b/Dockerfiles/agent/centos/Dockerfile
@@ -41,6 +41,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
    set -eux && \
    INSTALL_PKGS="bash \
            iputils \
+            c-ares \
            pcre2 \
            libcurl-minimal \
 #            libmodbus \
--- a/Dockerfiles/agent/ol/Dockerfile
+++ b/Dockerfiles/agent/ol/Dockerfile
@@ -42,6 +42,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
    set -eux && \
    INSTALL_PKGS="bash \
            iputils \
+            c-ares \
            pcre2 \
            libcurl \
 #            libmodbus \
--- a/Dockerfiles/agent/rhel/Dockerfile
+++ b/Dockerfiles/agent/rhel/Dockerfile
@@ -61,6 +61,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
    INSTALL_PKGS="bash \
            iputils \
            shadow-utils \
+            c-ares \
            pcre2 \
 #            libmodbus \
            libcurl-minimal \
--- a/Dockerfiles/agent/ubuntu/Dockerfile
+++ b/Dockerfiles/agent/ubuntu/Dockerfile
@@ -44,6 +44,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            tzdata \
            iputils-ping \
            ca-certificates \
+            libcares2 \
            libssl3t64 \
            libcurl4t64 \
            libmodbus5 \
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@@ -30,6 +30,7 @@ RUN set -eux && \
    INSTALL_PKGS="bash \
            autoconf \
            automake \
+            c-ares-dev \
            coreutils \
            curl \
            curl-dev \
--- a/Dockerfiles/build-base/centos/Dockerfile
+++ b/Dockerfiles/build-base/centos/Dockerfile
@@ -27,6 +27,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            bash \
            gcc \
            patch \
+            c-ares-devel \
            pcre2-devel \
            libcurl-devel \
            libevent-devel \
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@@ -29,6 +29,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            gcc \
            go-toolset \
            patch \
+            c-ares-devel \
            pcre2-devel \
            libcurl-devel \
            libevent-devel \
--- a/Dockerfiles/build-base/rhel/Dockerfile
+++ b/Dockerfiles/build-base/rhel/Dockerfile
@@ -41,6 +41,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            gcc \
            go-toolset \
            patch \
+            c-ares-devel \
            pcre2-devel \
            libcurl-devel \
            libevent-devel \
--- a/Dockerfiles/build-base/ubuntu/Dockerfile
+++ b/Dockerfiles/build-base/ubuntu/Dockerfile
@@ -28,6 +28,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            curl \
            gcc \
            libc6-dev \
+            libc-ares-dev \
            libcurl4-openssl-dev \
            libevent-dev \
            libmodbus-dev \
--- a/Dockerfiles/build-mysql/alpine/Dockerfile
+++ b/Dockerfiles/build-mysql/alpine/Dockerfile
@@ -84,6 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
            --with-libmodbus \
--- a/Dockerfiles/build-mysql/centos/Dockerfile
+++ b/Dockerfiles/build-mysql/centos/Dockerfile
@@ -84,6 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-mysql/ol/Dockerfile
+++ b/Dockerfiles/build-mysql/ol/Dockerfile
@@ -84,6 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-mysql/rhel/Dockerfile
+++ b/Dockerfiles/build-mysql/rhel/Dockerfile
@@ -95,6 +95,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile
@@ -84,6 +84,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
            --with-libmodbus \
--- a/Dockerfiles/build-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/build-pgsql/alpine/Dockerfile
@@ -86,6 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
            --with-libmodbus \
--- a/Dockerfiles/build-pgsql/centos/Dockerfile
+++ b/Dockerfiles/build-pgsql/centos/Dockerfile
@@ -85,6 +85,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-pgsql/ol/Dockerfile
+++ b/Dockerfiles/build-pgsql/ol/Dockerfile
@@ -86,6 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/build-pgsql/rhel/Dockerfile
@@ -97,6 +97,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
@@ -85,6 +85,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-proxy \
            --enable-server \
            --enable-webservice \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
            --with-libmodbus \
--- a/Dockerfiles/build-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile
@@ -76,6 +76,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-agent2 \
            --enable-java \
            --enable-proxy \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
            --with-libmodbus \
--- a/Dockerfiles/build-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/build-sqlite3/centos/Dockerfile
@@ -76,6 +76,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-agent2 \
            --enable-java \
            --enable-proxy \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ol/Dockerfile
@@ -76,6 +76,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-agent2 \
            --enable-java \
            --enable-proxy \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile
@@ -87,6 +87,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-agent2 \
            --enable-java \
            --enable-proxy \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
 #            --with-libmodbus \
--- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
@@ -76,6 +76,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
            --enable-agent2 \
            --enable-java \
            --enable-proxy \
+            --with-ares \
            --with-ldap \
            --with-libcurl \
            --with-libmodbus \
--- a/Dockerfiles/proxy-mysql/alpine/Dockerfile
+++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -eux && \
            krb5 \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/proxy-mysql/centos/Dockerfile
+++ b/Dockerfiles/proxy-mysql/centos/Dockerfile
@@ -53,6 +53,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            gzip \
            libssh \
            file-libs \
--- a/Dockerfiles/proxy-mysql/ol/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ol/Dockerfile
@@ -54,6 +54,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            libssh \
            file-libs \
            fping \
--- a/Dockerfiles/proxy-mysql/rhel/Dockerfile
+++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile
@@ -72,6 +72,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            shadow-utils \
            fping \
            iputils \
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -58,6 +58,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            ca-certificates \
            fping \
            openssl \
+            libcares2 \
            libcurl4t64 \
            libevent-2.1 \
            libevent-pthreads-2.1 \
--- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
@@ -52,6 +52,7 @@ RUN set -eux && \
            fping \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
@@ -51,6 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            libssh \
            fping \
            iputils \
--- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
@@ -52,6 +52,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            libssh \
            fping \
            iputils \
--- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
@@ -70,6 +70,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            shadow-utils \
            fping \
            iputils \
--- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@@ -56,6 +56,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            ca-certificates \
            fping \
            openssl \
+            libcares2 \
            libcurl4t64 \
            libevent-2.1 \
            libevent-pthreads-2.1 \
--- a/Dockerfiles/server-mysql/alpine/Dockerfile
+++ b/Dockerfiles/server-mysql/alpine/Dockerfile
@@ -54,6 +54,7 @@ RUN set -eux && \
            tzdata \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -53,6 +53,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            hostname \
            file-libs \
            iputils \
--- a/Dockerfiles/server-mysql/ol/Dockerfile
+++ b/Dockerfiles/server-mysql/ol/Dockerfile
@@ -54,6 +54,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            hostname \
            file-libs \
            iputils \
--- a/Dockerfiles/server-mysql/rhel/Dockerfile
+++ b/Dockerfiles/server-mysql/rhel/Dockerfile
@@ -72,6 +72,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            fping \
            shadow-utils \
            iputils \
--- a/Dockerfiles/server-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@@ -59,6 +59,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            traceroute \
            fping \
            openssl \
+            libcares2 \
            libcurl4t64 \
            libevent-2.1 \
            libevent-pthreads-2.1 \
--- a/Dockerfiles/server-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/server-pgsql/alpine/Dockerfile
@@ -54,6 +54,7 @@ RUN set -eux && \
            tzdata \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
@@ -55,6 +55,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            hostname \
            nmap \
            krb5-workstation \
+            c-ares \
            iputils \
            traceroute \
            libevent \
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@@ -56,6 +56,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            iputils \
            traceroute \
            libevent \
--- a/Dockerfiles/server-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/server-pgsql/rhel/Dockerfile
@@ -72,6 +72,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            traceroute \
            nmap \
            krb5-workstation \
+            c-ares \
            fping \
            shadow-utils \
            iputils \
--- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@@ -59,6 +59,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            traceroute \
            fping \
            openssl \
+            libcares2 \
            libcurl4t64 \
            libevent-2.1 \
            libevent-pthreads-2.1 \