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

Cherry pick image bump and re-add AJP as dynamic module (#10509)

Browse source 
* update nginx base, httpbun, e2e, helm webhook cert gen (#10506)

* update nginx base, httpbun, e2e, helm webhook cert gen

Signed-off-by: James Strong <strong.james.e@gmail.com>

* fix helm docs

Signed-off-by: James Strong <strong.james.e@gmail.com>

---------

Signed-off-by: James Strong <strong.james.e@gmail.com>

* Add AJP as dynamic for v1.8

* try again on dynamic module

* Fix ajp on chroot

---------

Signed-off-by: James Strong <strong.james.e@gmail.com>
Co-authored-by: James Strong <strong.james.e@gmail.com>
This commit is contained in:
Ricardo Katz 2023-10-11 22:46:46 -03:00 • committed by GitHub
parent 6d3a6b6a33
commit 285e157217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rootfs/Dockerfile-chroot
View file

@ -14,6 +14,9 @@
ARG BASE_IMAGE
# Source at https://github.com/rikatz/nginx-build-ajp
FROM docker.io/rpkatz/nginx-ajp-module:latest@sha256:31df5e44018dabfc9477fb69acb2f08af3ae4fd4a9fe80d3415ccc05fcb197d2 as ajp
FROM ${BASE_IMAGE} as chroot
# This intermediary image will be used only to copy all the required files to the chroot
@ -97,6 +100,8 @@ RUN apk add --no-cache libcap \
&& setcap -v cap_sys_chroot,cap_net_bind_service=+ep /usr/bin/dumb-init \
&& apk del libcap
COPY --from=ajp /ngx_http_ajp_module.so /chroot/etc/nginx/modules
RUN ln -sf /chroot/etc/nginx /etc/nginx \
&& ln -sf /chroot/tmp/nginx /tmp/nginx \
&& ln -sf /chroot/etc/ingress-controller /etc/ingress-controller \