Use c-ares library as DNS resolver

2025-10-02 17:45:52 +09:00 · 2025-10-02 17:45:52 +09:00 · 0a59ce5da2
commit 0a59ce5da2
parent f88647c0f4
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
@ -38,6 +38,7 @@ RUN set -eux && \
            tzdata \
            coreutils \
            iputils \
+            c-ares \
            pcre2 \
            libgcc \
            libcurl \
--- a/Dockerfiles/agent/centos/Dockerfile
+++ b/Dockerfiles/agent/centos/Dockerfile
@ -38,6 +38,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
@ -39,6 +39,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
@ -58,6 +58,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
@ -41,6 +41,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
@ -82,6 +82,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
@ -82,6 +82,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
@ -82,6 +82,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
@ -93,6 +93,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
@ -82,6 +82,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
@ -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/centos/Dockerfile
+++ b/Dockerfiles/build-pgsql/centos/Dockerfile
@ -83,6 +83,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
@ -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/rhel/Dockerfile
+++ b/Dockerfiles/build-pgsql/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-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
@ -83,6 +83,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
@ -74,6 +74,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
@ -74,6 +74,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
@ -74,6 +74,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
@ -85,6 +85,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
@ -74,6 +74,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
@ -45,6 +45,7 @@ RUN set -eux && \
            krb5 \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/proxy-mysql/centos/Dockerfile
+++ b/Dockerfiles/proxy-mysql/centos/Dockerfile
@ -45,6 +45,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
@ -46,6 +46,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
@ -64,6 +64,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
@ -50,6 +50,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
@ -45,6 +45,7 @@ RUN set -eux && \
            fping \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
@ -44,6 +44,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
@ -45,6 +45,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
@ -63,6 +63,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
@ -49,6 +49,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
@ -46,6 +46,7 @@ RUN set -eux && \
            tzdata \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/server-mysql/centos/Dockerfile
+++ b/Dockerfiles/server-mysql/centos/Dockerfile
@ -45,6 +45,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
@ -46,6 +46,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
@ -64,6 +64,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
@ -51,6 +51,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
@ -46,6 +46,7 @@ RUN set -eux && \
            tzdata \
            iputils \
            openssl \
+            c-ares \
            libcap \
            libcurl \
            libevent \
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
@ -47,6 +47,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
@ -48,6 +48,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
@ -64,6 +64,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
@ -51,6 +51,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
            traceroute \
            fping \
            openssl \
+            libcares2 \
            libcurl4t64 \
            libevent-2.1 \
            libevent-pthreads-2.1 \