From e965a4313d24f3cf5d1730638934eea693dae3ac Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 6 Jun 2022 12:49:33 +0000 Subject: [PATCH] 1.2.1-debian-11-r0 release --- .../1/debian-11/Dockerfile | 61 +++++++++++++++++++ .../1/debian-11/docker-compose.yml | 8 +++ .../opt/bitnami/.bitnami_components.json | 9 +++ .../opt/bitnami/licenses/licenses.txt | 3 + .../prebuildfs/usr/sbin/install_packages | 24 ++++++++ bitnami/nginx-ingress-controller/README.md | 2 +- 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 bitnami/nginx-ingress-controller/1/debian-11/Dockerfile create mode 100644 bitnami/nginx-ingress-controller/1/debian-11/docker-compose.yml create mode 100644 bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json create mode 100644 bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt create mode 100755 bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile new file mode 100644 index 000000000000..c8592fe4656b --- /dev/null +++ b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile @@ -0,0 +1,61 @@ +FROM docker.io/bitnami/minideb:bullseye +LABEL maintainer "Bitnami " + +ENV HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +# Install required system packages and dependencies +RUN install_packages ca-certificates curl gzip libbrotli1 libc6 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 tar wget zlib1g zlib1g-dev +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/nginx-ingress-controller-1.2.1-0-linux-amd64-debian-11.tar.gz && \ + echo "688788a686976c675a369a34b19b4c7959aa4ea04c482482cf8ef954703d9e5b /tmp/bitnami/pkg/cache/nginx-ingress-controller-1.2.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/nginx-ingress-controller-1.2.1-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/nginx-ingress-controller-1.2.1-0-linux-amd64-debian-11.tar.gz +RUN apt-get update && apt-get upgrade -y && \ + rm -r /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 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.2.1" \ + 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" + +EXPOSE 80 443 + +WORKDIR /opt/bitnami/nginx-ingress-controller +USER 1001 +ENTRYPOINT [ "nginx-ingress-controller" ] diff --git a/bitnami/nginx-ingress-controller/1/debian-11/docker-compose.yml b/bitnami/nginx-ingress-controller/1/debian-11/docker-compose.yml new file mode 100644 index 000000000000..eecd5bd110fa --- /dev/null +++ b/bitnami/nginx-ingress-controller/1/debian-11/docker-compose.yml @@ -0,0 +1,8 @@ +version: '2' + +services: + nginx-ingress-controller: + image: docker.io/bitnami/nginx-ingress-controller:1 + ports: + - '80:80' + - '443:443' diff --git 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 new file mode 100644 index 000000000000..4adf83d0e06d --- /dev/null +++ b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,9 @@ +{ + "nginx-ingress-controller": { + "arch": "amd64", + "digest": "688788a686976c675a369a34b19b4c7959aa4ea04c482482cf8ef954703d9e5b", + "distro": "debian-11", + "type": "NAMI", + "version": "1.2.1-0" + } +} \ No newline at end of file diff --git a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,3 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/nami/COPYING +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +set -u +export DEBIAN_FRONTEND=noninteractive +n=0 +max=2 +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index a9debab98bfd..b07852119bd0 100644 --- 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.com/) for deploy ## Supported tags and respective `Dockerfile` links -* [`1`, `1-debian-10`, `1.2.1`, `1.2.1-debian-10-r4`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx-ingress-controller/blob/1.2.1-debian-10-r4/1/debian-10/Dockerfile) +* [`1`, `1-debian-11`, `1.2.1`, `1.2.1-debian-11-r0`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx-ingress-controller/blob/1.2.1-debian-11-r0/1/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/nginx-ingress-controller GitHub repo](https://github.com/bitnami/bitnami-docker-nginx-ingress-controller).