chore: parameterize compilation flags

Author: theseion

.github/workflows/verifyimage.yml

@@ -146,5 +146,4 @@ jobs:
             -d tests/regression/tests \
             --log-file "tests/logs/${modsec_version}/error.log" \
             --overrides "tests/regression/${backend}-overrides.yaml" \
-            --show-failures-only \
-            --trace
+            --show-failures-only

apache/Dockerfile

@@ -3,6 +3,7 @@ ARG HTTPD_VERSION="n/a"
 FROM image AS build
 
 ARG MODSEC2_VERSION="n/a"
+ARG MODSEC2_FLAGS="n/a"
 ARG LUA_VERSION="n/a"
 
 RUN set -eux; \
@@ -31,7 +32,7 @@ RUN set -eux; \
     tar -zxvf v${MODSEC2_VERSION}.tar.gz; \
     cd ModSecurity-${MODSEC2_VERSION}; \
     ./autogen.sh; \
-    ./configure --with-yajl --with-ssdeep --with-pcre2; \
+    ./configure ${MODSEC2_FLAGS}; \
     make; \
     make install; \
     make clean

apache/Dockerfile-alpine

@@ -3,6 +3,7 @@ ARG HTTPD_VERSION="n/a"
 FROM image AS build
 
 ARG MODSEC2_VERSION="n/a"
+ARG MODSEC2_FLAGS="n/a"
 ARG LUA_VERSION="n/a"
 
 # see https://httpd.apache.org/docs/2.4/install.html#requirements
@@ -41,7 +42,7 @@ RUN set -eux; \
     tar -zxvf v${MODSEC2_VERSION}.tar.gz; \
     cd ModSecurity-${MODSEC2_VERSION}; \
     ./autogen.sh; \
-    ./configure --with-yajl --with-ssdeep --with-lmdb --with-pcre2; \
+    ./configure ${MODSEC2_FLAGS}; \
     make; \
     make install; \
     make clean

docker-bake.hcl

@@ -4,11 +4,19 @@ variable "modsec3-version" {
     default = "3.0.14"
 }
 
+variable "modsec3-flags" {
+    default = "--with-yajl --with-ssdeep --with-lmdb --with-pcre2 --with-maxmind --enable-silent-rules"
+}
+
 variable "modsec2-version" {
     # renovate: depName=ModSecurity2 packageName=owasp-modsecurity/ModSecurity datasource=github-releases
     default = "2.9.8"
 }
 
+variable "modsec2-flags" {
+    default = "--with-yajl --with-ssdeep --with-pcre2"
+}
+
 variable "crs-version" {
     # renovate: depName=coreruleset/coreruleset datasource=github-releases
     default = "4.12.0"
@@ -109,7 +117,9 @@ target "platforms-base" {
     args = {
         CRS_RELEASE = "${crs-version}"
         MODSEC2_VERSION = "${modsec2-version}"
+        MODSEC2_FLAGS = modsec2-flags
         MODSEC3_VERSION = "${modsec3-version}"
+        MODSEC3_FLAGS = modsec3-flags
         LUA_VERSION = "${lua-version}"
         LMDB_VERSION = "${lmdb-version}"
     }

nginx/Dockerfile

@@ -2,6 +2,7 @@ FROM image AS build
 
 ARG NGINX_VERSION="n/a"
 ARG MODSEC3_VERSION="n/a"
+ARG MODSEC3_FLAGS="n/a"
 ARG LMDB_VERSION="n/a"
 ARG LUA_VERSION="n/a"
 ARG NGINX_DYNAMIC_MODULES="n/a"
@@ -50,7 +51,7 @@ RUN set -eux; \
     sed -ie "s/i386-linux-gnu/${ARCH}/g" build/ssdeep.m4; \
     sed -ie "s/i386-linux-gnu/${ARCH}/g" build/pcre2.m4; \
     ./build.sh; \
-    ./configure --with-yajl --with-ssdeep --with-pcre2 --with-maxmind --enable-silent-rules; \
+    ./configure ${MODSEC3_FLAGS}; \
     make -j$(nproc) install; \
     strip /usr/local/modsecurity/lib/lib*.so*
 

nginx/Dockerfile-alpine

@@ -2,6 +2,7 @@ FROM image AS build
 
 ARG NGINX_VERSION="n/a"
 ARG MODSEC3_VERSION="n/a"
+ARG MODSEC3_FLAGS="n/a"
 ARG LUA_VERSION="n/a"
 ARG NGINX_DYNAMIC_MODULES="n/a"
 ARG NGINX_HOME="n/a"
@@ -48,7 +49,7 @@ RUN set -eux; \
     sed -ie "s/i386-linux-gnu/${ARCH}/g" build/ssdeep.m4; \
     sed -ie "s/i386-linux-gnu/${ARCH}/g" build/pcre2.m4; \
     ./build.sh; \
-    ./configure --with-yajl --with-ssdeep --with-lmdb --with-pcre2 --with-maxmind --enable-silent-rules; \
+    ./configure ${MODSEC3_FLAGS}; \
     make -j$(nproc) install; \
     strip /usr/local/modsecurity/lib/lib*.so*