[bitnami/nginx-ingress-controller] Release 1.4.0-debian-11-r2 (#8808)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
2026-03-29 16:27:49 +08:00 · 2022-10-03 22:54:03 +02:00
parent a0a16e6b8c
commit e9c79ca15a
3 changed files with 31 additions and 46 deletions
--- a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile
+++ b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH

 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
      org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.4.0-debian-11-r1" \
+      org.opencontainers.image.ref.name="1.4.0-debian-11-r2" \
      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx-ingress-controller" \
      org.opencontainers.image.title="nginx-ingress-controller" \
      org.opencontainers.image.vendor="VMware, Inc." \
@@ -18,58 +18,43 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl libbrotli1 libcap2-bin libcom-err2 libcrypt1 libcurl4 libcurl4-openssl-dev libffi7 libgcc-s1 libgcrypt20 libgeoip-dev libgeoip1 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblua5.1-0 liblua5.1-dev liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpcre3 libpcre3-dev libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libunistring2 libxml2 procps zlib1g zlib1g-dev
+RUN install_packages ca-certificates curl libbrotli1 libcap2-bin libcom-err2 libcrypt1 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgeoip1 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpcre3 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libunistring2 libxml2 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
+    if [ ! -f nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
    fi && \
-    sha256sum -c nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz nginx-ingress-controller-1.4.0-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    sha256sum -c nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz nginx-ingress-controller-1.4.0-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN apt-get update && apt-get upgrade -y && \
    apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
-RUN mkdir -p /opt/bitnami/nginx/conf/geoip && \
-    cd /opt/bitnami/nginx/conf/geoip && \
-    curl -fL https://github.com/kubernetes/ingress-nginx/raw/main/images/nginx/rootfs/etc/nginx/geoip/GeoIP.dat --output GeoIP.dat && \
-    curl -fL https://github.com/kubernetes/ingress-nginx/raw/main/images/nginx/rootfs/etc/nginx/geoip/GeoIPASNum.dat --output GeoIPASNum.dat && \
-    curl -fL https://github.com/kubernetes/ingress-nginx/raw/main/images/nginx/rootfs/etc/nginx/geoip/GeoLiteCity.dat --output GeoLiteCity.dat

-RUN setcap cap_net_bind_service=+ep /opt/bitnami/nginx/sbin/nginx && \
-    setcap -v cap_net_bind_service=+ep /opt/bitnami/nginx/sbin/nginx
-RUN setcap cap_net_bind_service=+ep /opt/bitnami/nginx-ingress-controller/bin/nginx-ingress-controller && \
-    setcap -v cap_net_bind_service=+ep /opt/bitnami/nginx-ingress-controller/bin/nginx-ingress-controller
-RUN mkdir -p /usr/local/nginx/sbin && \
-    ln -sf /opt/bitnami/nginx/sbin/nginx /usr/local/nginx/sbin/nginx && \
-    mkdir -p /usr/bin && \
-    ln -sf /opt/bitnami/nginx/sbin/nginx /usr/bin/nginx
-RUN ln -sf /opt/bitnami/nginx/conf /etc/nginx && \
-    ln -sf /opt/bitnami/nginx/modules /etc/nginx/modules
-RUN ln -sf /opt/bitnami/nginx-ingress-controller/bin/nginx-ingress-controller /nginx-ingress-controller
+RUN ln -s /usr/local/nginx/sbin/nginx /usr/bin/nginx && \
+    ln -s /nginx-ingress-controller /usr/bin/nginx-ingress-controller
+RUN cd /opt/bitnami/nginx-ingress-controller && \
+    mkdir -p rootfs/etc/ingress-controller/ssl rootfs/etc/ingress-controller/auth rootfs/var/log/nginx rootfs/tmp/nginx && \
+    if grep -q www-data /etc/passwd; then chown -R www-data rootfs/etc rootfs/var rootfs/tmp; fi && \
+    chgrp -R root rootfs/etc rootfs/var rootfs/tmp && \
+    chmod -R g+rwX rootfs/etc rootfs/var rootfs/tmp && \
+    cp -rp rootfs/. / && \
+    rm -rf rootfs && \
+    ldconfig /usr/local/lib
+RUN setcap    cap_net_bind_service=+ep /usr/local/nginx/sbin/nginx && \
+    setcap -v cap_net_bind_service=+ep /usr/local/nginx/sbin/nginx
+RUN setcap    cap_net_bind_service=+ep /nginx-ingress-controller && \
+    setcap -v cap_net_bind_service=+ep /nginx-ingress-controller
 RUN mkdir -p /etc/ingress-controller/auth /etc/ingress-controller/ssl
-RUN ln -s /opt/bitnami/lua/lib/lua /usr/local/lib/lua
-RUN mkdir -p /tmp/nginx
-RUN ln -sf /opt/bitnami/nginx-ingress-controller/scripts /ingress-controller
-RUN mkdir -p /opt/bitnami/nginx/logs && \
-    ln -sf /opt/bitnami/nginx/logs /var/log/nginx && \
-    ln -sf /dev/stdout /var/log/nginx/access.log && \
-    ln -sf /dev/stderr /var/log/nginx/error.log
-RUN chown -LR www-data:root /etc/nginx /etc/ingress-controller
-RUN chgrp -R root /var/log && \
-    chmod g+rwX -R /var/log && \
-    chgrp -R root /opt/bitnami/nginx/conf && \
-    chmod g+rwX -R /opt/bitnami/nginx/conf && \
-    chmod -R g+rwX /opt/bitnami/nginx-ingress-controller /etc/nginx /etc/ingress-controller && \
-    chmod g+rwX -R /tmp/nginx
 ENV APP_VERSION="1.4.0" \
    BITNAMI_APP_NAME="nginx-ingress-controller" \
-    LUA_CPATH="/opt/bitnami/nginx/conf/lua/?.so;/opt/bitnami/lua/lib/lua/5.1/?.so;./?.so;/opt/bitnami/lua/lib/lua/?.so;;" \
-    LUA_PATH="/opt/bitnami/lua/share/lua/5.1/?/init.lua;/opt/bitnami/lua/lib/lua/?.lua;/opt/bitnami/lua/lib/lua/5.1/?.lua;/opt/bitnami/nginx/conf/lua/?.lua;;" \
-    PATH="/opt/bitnami/nginx-ingress-controller/bin:/opt/bitnami/nginx/sbin:$PATH"
+    LD_LIBRARY_PATH="/lib:/usr/lib:/usr/local/lib:/modules_mount/etc/nginx/modules/otel" \
+    LUA_CPATH="/usr/local/lib/lua/?/?.so;/usr/local/lib/lua/?.so;;" \
+    LUA_PATH="/usr/local/share/luajit-2.1.0-beta3/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/lib/lua/?.lua;;" \
+    PATH="/opt/bitnami/nginx-ingress-controller/bin:/opt/bitnami/nginx/sbin:$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin"

 EXPOSE 80 443

-WORKDIR /opt/bitnami/nginx-ingress-controller
+WORKDIR /etc/nginx
 USER 1001
-ENTRYPOINT [ "nginx-ingress-controller" ]
+ENTRYPOINT [ "/nginx-ingress-controller" ]
--- a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,9 +1,9 @@
 {
    "nginx-ingress-controller": {
        "arch": "amd64",
-        "digest": "26a03101c2814434c51daf2f9cc94e859474d6b11e3e0a377b55ed8bb94ea5cf",
+        "digest": "53bf4ffc4900ebdf743dec0dfa36ea49935fe3658fbc53f26c755f77d62f208a",
        "distro": "debian-11",
        "type": "NAMI",
-        "version": "1.4.0-1"
+        "version": "1.4.0-3"
    }
 }
--- a/bitnami/nginx-ingress-controller/README.md
+++ b/bitnami/nginx-ingress-controller/README.md
@@ -34,7 +34,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy
 ## Supported tags and respective `Dockerfile` links


-* [`1`, `1-debian-11`, `1.4.0`, `1.4.0-debian-11-r1`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile)
+* [`1`, `1-debian-11`, `1.4.0`, `1.4.0-debian-11-r2`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile)

 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).