From fdb26b1da48134a2d80b970392bf7888846125d7 Mon Sep 17 00:00:00 2001 From: zengxs Date: Fri, 22 Nov 2024 19:32:40 +0800 Subject: [PATCH] Add nginx-otel --- .gitmodules | 3 +++ Dockerfile | 6 +++++- modules/nginx-otel | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 modules/nginx-otel diff --git a/.gitmodules b/.gitmodules index 9fc7cc5..5717724 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "modules/naxsi"] path = modules/naxsi url = https://github.com/wargio/naxsi.git +[submodule "modules/nginx-otel"] + path = modules/nginx-otel + url = https://github.com/nginxinc/nginx-otel.git diff --git a/Dockerfile b/Dockerfile index 65a9c59..2142951 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN set -ex \ && apt-get install -y --no-install-recommends \ build-essential \ git \ + cmake \ automake \ autoconf \ libtool \ @@ -20,7 +21,8 @@ RUN set -ex \ libssl-dev \ libpcre3-dev \ zlib1g-dev \ - libmodsecurity-dev + libmodsecurity-dev \ + libgrpc++-dev # install build dependencies for additional dynamic modules RUN set -ex \ @@ -72,6 +74,7 @@ RUN set -ex \ --add-dynamic-module=/usr/src/modules/iconv-nginx-module \ --add-dynamic-module=/usr/src/modules/ModSecurity-nginx \ --add-dynamic-module=/usr/src/modules/naxsi/naxsi_src \ + --add-dynamic-module=/usr/src/modules/nginx-otel \ | bash -x \ # build modules && make modules -j$(nproc) \ @@ -132,6 +135,7 @@ RUN set -ex \ libxslt1.1 \ libmaxminddb0 \ libzstd1 \ + libgrpc++1.51 \ libmodsecurity3 \ modsecurity-crs \ && rm -rf /var/lib/apt/lists/* diff --git a/modules/nginx-otel b/modules/nginx-otel new file mode 160000 index 0000000..6c1659a --- /dev/null +++ b/modules/nginx-otel @@ -0,0 +1 @@ +Subproject commit 6c1659a20ba946cdde21e9dbc52e7c740b06d968