feat: add ingress-nginx-controller Dockerfile

build.py

@@ -248,10 +248,6 @@ class DockerBuilder:
     @forall_images(consume_result=True)
     def render_dockerfiles(self, **kwargs):
         def install_pakages(*names):
-            temp = "rpm rsync://basalt.office.basealt.ru/space/ALT Sisyphus/$(uname -m) classic"
-            temp_i586 = "rpm rsync://basalt.office.basealt.ru/space/ALT Sisyphus/i586 classic"
-            temp_armh = "rpm rsync://basalt.office.basealt.ru/space/ALT Sisyphus/armh classic"
-            temp_noarch = "rpm rsync://basalt.office.basealt.ru/space/ALT Sisyphus/noarch classic"
             tasks = self.tasks.get(self.branch, kwargs["image"])
             linux32 = '$([ "$(rpm --eval %_host_cpu)" = i586 ] && echo linux32)'
             if tasks:
@@ -261,13 +257,6 @@ class DockerBuilder:
                 apt_repo += "\n    apt-get update && \\"
             else:
                 apt_repo = "\\"
-            apt_repo = "\\\n    apt-get install apt-repo apt-rsync -y && \\"
-            apt_repo += f"\n    {linux32} apt-repo rm all && \\"
-            apt_repo += f'\n    $($([ "$(rpm --eval %_host_cpu)" = i586 ] && {linux32} apt-repo add "{temp_i586}") || true) && \\'
-            apt_repo += f'\n    $($([ "$(rpm --eval %_host_cpu)" = armv7l ] && {linux32} apt-repo add "{temp_armh}") || true) && \\'
-            apt_repo += f'\n    $($([ "$(rpm --eval %_host_cpu)" != i586 ] && [ "$(rpm --eval %_host_cpu)" != armv7l ] && {linux32} apt-repo add "{temp}") || true) && \\'
-            apt_repo += f'\n    {linux32} apt-repo add "{temp_noarch}" && \\'
-            apt_repo += "\n    apt-get update && \\"
             update_command = f"""RUN apt-get update && {apt_repo}"""
             install_command = f"""
             {linux32} apt-get install -y {' '.join(names)} && \\

org/k8s/ingress-nginx-controller/Dockerfile.template

@@ -0,0 +1,87 @@
+# Copyright 2015 The Kubernetes Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+{{ install_pakages("nginx", "ingress-nginx", "ingress-nginx-data", "diffutils", "libcap-utils") }}
+
+RUN mv /etc/nginx/nginx.conf.sample /etc/nginx/nginx.conf
+
+ARG VERSION=v1.8.1
+ARG COMMIT_SHA=1b13845fd
+ARG BUILD_ID=UNSET
+
+LABEL org.opencontainers.image.title="NGINX Ingress Controller for Kubernetes"
+LABEL org.opencontainers.image.documentation="https://kubernetes.github.io/ingress-nginx/"
+LABEL org.opencontainers.image.source="https://github.com/kubernetes/ingress-nginx"
+LABEL org.opencontainers.image.vendor="The Kubernetes Authors"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.revision="${COMMIT_SHA}"
+
+LABEL build_id="${BUILD_ID}"
+
+WORKDIR  /etc/nginx
+
+RUN /usr/sbin/groupadd -r -f www-data 2>/dev/null
+RUN /usr/sbin/useradd -g www-data -c 'www-data' -d /var/www -s '/sbin/nologin' -G www-data -r www-data 2>/dev/null
+
+RUN chown www-data:www-data -R /etc/nginx
+
+RUN mv /usr/bin/dbg /dbg \
+  && chown www-data:www-data /dbg
+RUN mv /usr/bin/nginx-ingress-controller /nginx-ingress-controller \
+  && chown www-data:www-data /nginx-ingress-controller
+RUN mv /usr/bin/wait-shutdown /wait-shutdown \
+  && chown www-data:www-data /wait-shutdown
+
+# Fix permission during the build to avoid issues at runtime
+# with volumes (custom templates)
+RUN bash -xeu -c ' \
+  writeDirs=( \
+    /etc/ingress-controller \
+    /etc/ingress-controller/ssl \
+    /etc/ingress-controller/auth \
+    /var/log \
+    /var/log/nginx \
+    /tmp/nginx \
+  ); \
+  for dir in "${writeDirs[@]}"; do \
+    mkdir -p ${dir}; \
+    chown -R www-data:www-data ${dir}; \
+  done' \
+  # LD_LIBRARY_PATH does not work so below is needed for  opentelemetry/other modules
+  # Put libs of newer modules under `/modules_mount/<other>/lib` and add that path below
+  # Could get complicated arch specific paths become a need
+  && echo "/lib:/usr/lib:/usr/local/lib:/modules_mount/etc/nginx/modules/otel" > /etc/ld-musl-x86_64.path
+
+
+RUN setcap    cap_net_bind_service=+ep /nginx-ingress-controller \
+  && setcap -v cap_net_bind_service=+ep /nginx-ingress-controller \
+  && setcap    cap_net_bind_service=+ep /usr/sbin/nginx \
+  && setcap -v cap_net_bind_service=+ep /usr/sbin/nginx \
+  #&& setcap    cap_net_bind_service=+ep /usr/bin/dumb-init \
+  #&& setcap -v cap_net_bind_service=+ep /usr/bin/dumb-init \
+  #&& apk del libcap \
+  && ln -sf /usr/sbin/nginx /usr/bin/nginx
+
+USER www-data
+
+# Create symlinks to redirect nginx logs to stdout and stderr docker log collector
+RUN  ln -sf /dev/stdout /var/log/nginx/access.log \
+  && ln -sf /dev/stderr /var/log/nginx/error.log
+
+#ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
+CMD ["/nginx-ingress-controller"]

tags.toml

@@ -45,3 +45,6 @@ sisyphus = [ "v0.22.3" ]
 ["k8s/flannel-cni-plugin"]
 p10 = [ "v1.1.2" ]
 sisyphus = [ "v1.2.0" ]
+
+["k8s/ingress-nginx-controller"]
+sisyphus = [ "v1.8.1" ]

tasks.toml

@@ -0,0 +1,2 @@
+[sisyphus]
+325528 = [ "k8s/ingress-nginx-controller" ]