refix(infra): NGINX install

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: I66482d79734758f45c99f67d34273a5524a213b0
(cherry picked from commit 528fa294d4e60c6c9dbc122057f95160a3becd8a)
(cherry picked from commit 155956be86660c459b6d0c90c2aa1e83ded09217)

diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
index f30caeb..b860f1e 100644 (file)
--- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
+++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get -q update \
         libnuma1 \
         libnuma-dev \
         libpcap-dev \
+        libpcre2-dev \
         libpixman-1-dev \
         libsctp-dev \
         libssl-dev \

diff --git a/resources/libraries/bash/function/nginx.sh b/resources/libraries/bash/function/nginx.sh
index 37c7be6..8c898ec 100755 (executable)
--- a/resources/libraries/bash/function/nginx.sh
+++ b/resources/libraries/bash/function/nginx.sh
@@ -108,8 +108,6 @@ function nginx_compile () {
     param+="--with-pcre "
     # Enable ngx_http_realip_module.
     param+="--with-http_realip_module "
-    # Disable http_rewrite_module
-    param+="--without-http_rewrite_module "
     params=(${param})
     ./configure "${params[@]}" || die "Failed to configure NGINX!"
     make -j 16;make install || die "Failed to compile NGINX!"