DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Images: Bump Alpine to v3.21. (#12528)

Browse source 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
This commit is contained in:
k8s-infra-cherrypick-robot 2024-12-20 15:52:10 -08:00 • committed by GitHub
parent fe6d1b7ef8
commit 0d98a278b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
images/nginx/rootfs/build.sh
View file

@ -414,6 +414,21 @@ Include /etc/nginx/owasp-modsecurity-crs/rules/RESPONSE-980-CORRELATION.conf
Include /etc/nginx/owasp-modsecurity-crs/rules/RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf
" > /etc/nginx/owasp-modsecurity-crs/nginx-modsecurity.conf
# NGINX compiles a small test program to check if an added module works as expected.
#
# ModSecurity-nginx provides 'printf("hello");' as a test, but newer versions of GCC,
# as included in Alpine 3.21, do not allow implicit declaration of function 'printf':
#
# objs/autotest.c:7:5: error: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
#
# For this reason we replace 'printf("hello");' by 'msc_init();', which is always available.
#
# This fix is taken from a PR, that has been proposed to the ModSecurity-nginx project:
#
# https://github.com/owasp-modsecurity/ModSecurity-nginx/pull/275
#
sed -i "s/ngx_feature_test='printf(\"hello\");'/ngx_feature_test='msc_init();'/" $BUILD_PATH/ModSecurity-nginx/config
# build nginx
cd "$BUILD_PATH/nginx-$NGINX_VERSION"
@ -609,7 +624,7 @@ adduser -S -D -H -u 101 -h /usr/local/nginx -s /sbin/nologin -G www-data -g www-
for dir in "${writeDirs[@]}"; do
mkdir -p ${dir};
chown -R www-data.www-data ${dir};
chown -R www-data:www-data ${dir};
done
rm -rf /etc/nginx/owasp-modsecurity-crs/.git