Switch Apache Debian image to Docker hardened image (dhi.io/httpd)#420
Switch Apache Debian image to Docker hardened image (dhi.io/httpd)#420Copilot wants to merge 5 commits into
Conversation
Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/a01215c0-b9eb-42e6-b191-fceaffabbfc8 Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
|
@copilot fix the ci |
…l stage Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/b8dfba58-0518-4bbe-92a4-42975b9882fe Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Fixed in d2ee167. The hardened |
|
@copilot rebase and fix conflicts. CI is still failing also. |
…sync versions and go-ftw from main Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/a57c6113-2408-46af-ad7a-dd8e80ba5df8 Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/a57c6113-2408-46af-ad7a-dd8e80ba5df8 Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
Fixed in 48faaf5 and d4e6e76. The remaining CI failures were:
The branch is now forward of the remote without a rebase, so no force-push was needed. |
docker-bake.hcl: change the Apache Debian variant's runtimeimagetodhi.io/httpd:${httpd-version}, addbuild_image = httpd:${httpd-version}for build stages, addbuild_imageto alpine entry too (same asimage), propagatebuild_imagecontext in the target; sync version bumps from main (modsec2 2.9.13, modsec3 3.0.15, CRS 4.26.0, nginx 1.30.0, httpd 2.4.67); restorev4-lts-crs-versionvariable that was accidentally merged intomajor-crs-versionapache/Dockerfile:FROM image AS build/crs_releasewithFROM build_imageFROM build_image AS runtime_depsstage that installs runtime packages and collects them into/staging/viadpkg -Lapt-get installblock in final stage withCOPY --from=runtime_deps /staging/ /RUN useradd --system httpd; changehttpd→www-datafor chown and USERgnupgfrom runtimeUSER 0(numeric root UID) before the privileged setup RUN — hardened image has no namedrootuser in/etc/passwdwget+ tar togit clone --recursivefor ModSecurity v2 (needed for libinjection submodule).github/workflows/publish.yml: adddocker/login-actionstep to authenticate todhi.ioregistry.github/workflows/verifyimage.yml: adddocker/login-actionstep; updateGO_FTW_VERSIONto2.1.0(sync from main)README.md: note Apache Debian uses Docker hardened base image; sync version numbers from main