feat: add ingress-nginx-controller Dockerfile

2024-04-04 15:12:46 +03:00
71 changed files with 161 additions and 738 deletions
--- a/.gitea/workflows/build-k8s-images.yaml
+++ b/.gitea/workflows/build-k8s-images.yaml
@ -1,42 +0,0 @@
-name: Build kubernetes images
-on:
-  push:
-    branches:
-      - test-gitea-actions
-    paths:
-      - ".gitea/workflows/build-k8s-images.yaml"
-      - "org/k8s/kube-apiserver/**"
-      - "org/k8s/kube-controller-manager/**"
-      - "org/k8s/kube-scheduler/**"
-      - "org/k8s/kube-proxy/**"
-      - "tags.toml"
-      - "k8s-images.sh"
-  schedule:
-    - cron: "30 3 1 * *"
-
-jobs:
-  build-images:
-    runs-on: alt-latest
-    steps:
-      - name: Install the dependencies
-        run: |
-          apt-get update
-          apt-get install -y \
-          podman \
-          python3-module-tomli \
-          python3-module-jinja2 \
-          qemu-user-static-binfmt-aarch64 \
-          qemu-user-static-binfmt-arm \
-          qemu-user-static-binfmt-ppc
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Log into gitea.basealt.ru
-        run: podman login -u stepchenkoas -p "${{ secrets.ACTIONS_TOKEN }}" gitea.basealt.ru
-      - name: Build docker images for p10 (kube-apiserver, kube-controller-manager, kube-scheduler, kube-proxy)
-        run: ${{ gitea.workspace }}/build-k8s-images.sh gitea.basealt.ru k8s-p10 p10
-      - name: Push docker images for p10 to gitea.basealt.ru
-        run: ${{ gitea.workspace }}/push-k8s-images.sh gitea.basealt.ru k8s-p10 p10
-      - name: Build docker images for sisyphus (kube-apiserver, kube-controller-manager, kube-scheduler, kube-proxy)
-        run: ${{ gitea.workspace }}/build-k8s-images.sh gitea.basealt.ru k8s-sisyphus sisyphus
-      - name: Push docker images for sisyphus to gitea.basealt.ru
-        run: ${{ gitea.workspace }}/push-k8s-images.sh gitea.basealt.ru k8s-sisyphus sisyphus
--- a/.gitea/workflows/testscript
+++ b/.gitea/workflows/testscript
@ -1,65 +0,0 @@
-#!/bin/bash
-
-#$1 - ${{ needs.build-process.outputs.branch }}
-#$2 - ${{ needs.build-process.outputs.org }}
-#$3 - ${{ needs.build-process.outputs.url }}
-#$4 - ${{ needs.build-process.outputs.repo }}
-#$5 - ${{ gitea.workspace }}
-
-errors=''
-haserr=false
-for IM in $(ls $5/org/$2/ | xargs)
-do 
-  echo "image=$IM"
-  if test -f $5/org/$2/$IM/test
-  then 
-    test=$(cat $5/org/$2/$IM/test)
-  else test=''
-  fi 
-
-  echo "test script=$test"
-  imgpath="$2/$IM:$1"
-
-  if [[ $2 == 'k8s' ]]
-    then imgpath="$2-$1/$IM:latest"
-  fi
-
-  command="echo empty_command"
-  if [[ $test != '' ]]; then
-    command="podman run --rm --entrypoint=\"/bin/sh\" $3/$imgpath -c \"$test\""
-  else
-    if [[ $IM = 'distroless-true' ]]; then
-      command="podman run --rm $3/$imgpath \"true\""
-    fi
-    if [[ $IM = 'distroless-gotop' ]]; then 
-      command="podman run --rm $3/$imgpath \"--version\""
-    fi 
-    if [[ $IM = 'flannel-cni-plugin' ]]; then
-      command="podman run --rm $3/$imgpath \"/flannel\""
-    fi
-    if [[ $IM = 'pause' ]]; then 
-      command="podman run --rm $3/$imgpath \"/pause\" \"-v\""
-    fi 
-  fi
-  echo $command
-  eval $command 2>$IM.log || haserr=true
-
-  echo "podman rmi --all"
-  podman rmi --all
-
-  if [ "$haserr" = true ]
-  then 
-    if [[ $(cat $IM.log) != '' ]]
-    then errors="TEST ERROR OF IMAGE $IM: $(cat $IM.log); $errors"
-    else errors="TEST ERROR OF IMAGE $IM: test returned empty error, but exit status was nozero; $errors"
-    fi 
-  fi 
-  haserr=false
-done
-
-echo "$errors"
-if [[ $errors != '' ]]
-  then haserr=true 
-fi
-echo "ERR=$haserr" > haserr.log
-echo $errors > errors.log
--- a/.gitea/workflows/wf_full_p10.yaml
+++ b/.gitea/workflows/wf_full_p10.yaml
@ -1,134 +0,0 @@
-name: Full building alt images
-on:
-  push:
-    tags:
-      - '*10*_*'
-
-jobs:
-  build-process:
-    runs-on: alt-p10
-    outputs:
-      branch: ${{ env.BRANCH }}
-      org: ${{ env.ORG }}
-      url: ${{ env.URL }}
-      repo: ${{ env.REPO }}
-      buildres: ${{ steps.build-script.outcome }}
-    steps:
-      - name: Check workspace
-        run: |
-          repourl=$(echo $GU | cut -d '/' -f 3)
-          echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
-          reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
-        env:
-          GU: ${{ gitea.server_url }}
-          GR: ${{ gitea.repository }}
-      - name: Set repo for c10f2 (Temporary)
-        if: ${{ contains(github.ref_name, 'c10f2') }}
-        run: |
-          echo "event tag=${{ github.ref_name }}" 
-          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
-          echo "cat /etc/hosts"
-          cat /etc/hosts
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Parse target branch and tag from events context, save to env                                
-        env:
-          EV: ${{ toJson(gitea.event) }}                                         
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}                              
-          echo "ORG=$org"
-      - name: Login podman gitea
-        run: |
-          echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
-        env:
-          P_USER: ${{ secrets.PODMAN_USER }}
-          P_PASS: ${{ secrets.PODMAN_PASS }}
-      - name: Run building script
-        id: build-script
-        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
-          if [[ $BR == 'c10f1' || $BR == 'c10f2' ]]; then build_args="$build_args --skip-arches arm ppc64le"; fi
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
-          echo "build.py $build_args"
-          ${{ gitea.workspace }}/build.py $build_args
-        env:
-          ORG: ${{ env.ORG }}
-          BR: ${{ env.BRANCH }}
-        continue-on-error: true
-      - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
-          issueid=1
-          body="Building images finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-      - name: Delete event tag
-        run: |
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"                    
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          EV: ${{ toJson(gitea.event) }}
-  test-process:
-    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-p10
-    steps:
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-      - name: Check out current repo
-        uses: https://gitea.com/actions/checkout@v4
-      - name: Test
-        id: test-script
-        continue-on-error: true
-        run: |
-          $WS/.gitea/workflows/testscript $BR $ORG $URL $REPO $WS
-          cat haserr.log >> ${GITHUB_ENV}
-          echo "test process finished"
-        env:
-          BR: ${{ needs.build-process.outputs.branch }}
-          ORG: ${{ needs.build-process.outputs.org }}
-          URL: ${{ needs.build-process.outputs.url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-          WS: ${{ gitea.workspace }}
-      - name: Send notification if test crashed
-        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
-        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing images finish with some errors. $errors"
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
--- a/.gitea/workflows/wf_full_sis.yaml
+++ b/.gitea/workflows/wf_full_sis.yaml
@ -1,127 +0,0 @@
-name: Full building alt images
-on:
-  push:
-    tags:
-      - 'sisyphus_*'
-
-jobs:
-  build-process:
-    runs-on: alt-sisyphus
-    outputs:
-      branch: ${{ env.BRANCH }}
-      org: ${{ env.ORG }}
-      url: ${{ env.URL }}
-      repo: ${{ env.REPO }}
-      buildres: ${{ steps.build-script.outcome }}
-    steps:
-      - name: Check workspace
-        run: |
-          repourl=$(echo $GU | cut -d '/' -f 3)
-          echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
-          reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
-        env:
-          GU: ${{ gitea.server_url }}
-          GR: ${{ gitea.repository }}
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Parse target branch and tag from events context, save to env                                
-        env:
-          EV: ${{ toJson(gitea.event) }}                                         
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}                              
-          echo "ORG=$org"
-      - name: Login podman gitea
-        run: |
-          echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
-        env:
-          P_USER: ${{ secrets.PODMAN_USER }}
-          P_PASS: ${{ secrets.PODMAN_PASS }}
-      - name: Run building script
-        id: build-script
-        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
-          if [[ $BR == 'sisyphus' ]]; then build_args="$build_args --skip-arches arm"; fi
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
-          echo "build.py $build_args"
-          ${{ gitea.workspace }}/build.py $build_args
-        env:
-          ORG: ${{ env.ORG }}
-          BR: ${{ env.BRANCH }}
-        continue-on-error: true
-      - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
-          issueid=1
-          body="Building images finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-      - name: Delete event tag
-        run: |
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"                    
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          EV: ${{ toJson(gitea.event) }}
-  test-process:
-    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-sisyphus
-    steps:
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-      - name: Check out current repo
-        uses: https://gitea.com/actions/checkout@v4
-      - name: Test
-        id: test-script
-        continue-on-error: true
-        run: |
-          $WS/.gitea/workflows/testscript $BR $ORG $URL $REPO $WS
-          cat haserr.log >> ${GITHUB_ENV}
-          echo "test process finished"
-        env:
-          BR: ${{ needs.build-process.outputs.branch }}
-          ORG: ${{ needs.build-process.outputs.org }}
-          URL: ${{ needs.build-process.outputs.url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-          WS: ${{ gitea.workspace }}
-      - name: Send notification if test crashed
-        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
-        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing images finish with some errors. $errors"
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
--- a/README.md
+++ b/README.md
@ -28,9 +28,7 @@ If you push to the users repository, then organiztion is your username.

 ## Dependencies
 On x86_64 machine using p10 branch you need:
- `podman`
 - `python3-module-tomli`
- `python3-module-jinja2`
 - `qemu-user-static-binfmt-aarch64` to build for arm64 architecture
 - `qemu-user-static-binfmt-arm` to build for arm architecture
 - `qemu-user-static-binfmt-ppc` to build for ppc64le architecture
--- a/build.py
+++ b/build.py
@ -225,7 +225,7 @@ class DockerBuilder:
        self,
        template: str,
        organization: str,
-        install_packages=None,
+        install_pakages=None,
        **kwargs,
    ) -> str:
        if self.registry:
@ -237,7 +237,7 @@ class DockerBuilder:
        rendered = Template(template).render(
            alt_image=alt_image,
            branch=self.branch,
-            install_packages=install_packages,
+            install_pakages=install_pakages,
            organization=organization,
            registry=registry,
            **kwargs,
@ -247,7 +247,7 @@ class DockerBuilder:

    @forall_images(consume_result=True)
    def render_dockerfiles(self, **kwargs):
-        def install_packages(*names):
+        def install_pakages(*names):
            tasks = self.tasks.get(self.branch, kwargs["image"])
            linux32 = '$([ "$(rpm --eval %_host_cpu)" = i586 ] && echo linux32)'
            if tasks:
@ -273,7 +273,7 @@ class DockerBuilder:
            rendered = self.render_template(
                dockerfile_template.read_text(),
                self.overwrite_organization,
-                install_packages,
+                install_pakages,
            )
            kwargs["dockerfile"].write_text(rendered + "\n")

@ -639,7 +639,7 @@ class ImagesInfo:
 def parse_args():
    stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
    arches = ["amd64", "386", "arm64", "arm", "ppc64le"]
-    branches = ["p9", "p10", "sisyphus", "c10f1", "c10f2"]
+    branches = ["p9", "p10", "sisyphus"]
    organizations = list(ORG_DIR.iterdir())
    images = [f"{o.name}/{i.name}" for o in organizations for i in o.iterdir()]
    organizations = [o.name for o in organizations]
@ -654,8 +654,7 @@ def parse_args():
        nargs="+",
        default=images,
        choices=images,
-        metavar="IMAGE_NAME",
-        help="list of images to build",
+        help="list of branches",
    )
    images_group.add_argument(
        "-o",
@ -665,18 +664,10 @@ def parse_args():
        choices=organizations,
        help="build all images from these organizations",
    )
-    parser.add_argument(
-        "--skip-images",
-        nargs="+",
-        default=[],
-        choices=images,
-        metavar="IMAGE_NAME",
-        help="list of images to skip",
-    )
    parser.add_argument(
        "-r",
        "--registry",
-        default="gitea.basealt.ru",
+        default="registry.altlinux.org",
    )
    parser.add_argument(
        "--overwrite-organization",
@ -705,20 +696,27 @@ def parse_args():
    parser.add_argument(
        "--sign",
    )
+    parser.add_argument(
+        "--skip-images",
+        nargs="+",
+        default=[],
+        choices=images,
+        help="list of skipping images",
+    )
    parser.add_argument(
        "-a",
        "--arches",
        nargs="+",
        default=arches,
        choices=arches,
-        help="build images for these architectures",
+        help="list of arches",
    )
    parser.add_argument(
        "--skip-arches",
        nargs="+",
        default=[],
        choices=arches,
-        help="list of architectures to skip",
+        help="list of skipping arches",
    )
    parser.add_argument(
        "-b",
@ -726,28 +724,28 @@ def parse_args():
        nargs="+",
        default=branches,
        choices=branches,
-        help="build images for these branches",
+        help="list of branches",
    )
    parser.add_argument(
        "--skip-branches",
        nargs="+",
        default=[],
        choices=branches,
-        help="list of branches to skip",
+        help="list of skipping branches",
    )
    parser.add_argument(
        "--stages",
        nargs="+",
        default=stages,
        choices=stages,
-        help="list of stages to go through",
+        help="list of stages",
    )
    parser.add_argument(
        "--skip-stages",
        nargs="+",
        default=[],
        choices=stages,
-        help="list of stages to skip",
+        help="list of skipping stages",
    )
    args = parser.parse_args()

--- a/k8s-images.sh
+++ b/k8s-images.sh
@ -1,59 +0,0 @@
-#!/usr/bin/env sh
-
-set -xeuo pipefail
-
-function print_help() {
-    cat <<EOF
-usage:
-$0 (build | push) <REGISTRY> <ORGANIZATION> <BRANCH>
-EOF
-}
-
-if [ "$#" -lt 4 ]; then
-    print_help
-    exit 1
-fi
-
-COMMAND=$1
-REGISTRY=${2:-"gitea.basealt.ru"}
-ORGANIZATION=${3:-"k8s-sisyphus"}
-BRANCH=${4:-"sisyphus"}
-
-shift 4
-
-[ "$COMMAND" == 'build' ] || [ "$COMMAND" == 'push' ] || exit 1
-
-function build() {
-    ./build.py \
-    --branches $BRANCH \
-    --latest $BRANCH \
-    --registry $REGISTRY \
-    --overwrite-organization $ORGANIZATION \
-    --images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-scheduler k8s/kube-proxy \
-    --tags tags.toml \
-    --skip-stages push \
-    "$@"
-}
-
-function push() {
-    ./build.py \
-    --branches $BRANCH \
-    --latest $BRANCH \
-    --registry $REGISTRY \
-    --overwrite-organization $ORGANIZATION \
-    --images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-scheduler k8s/kube-proxy \
-    --tags tags.toml \
-    --stages push \
-    "$@"
-}
-
-for version in 1.26.14 1.27.12 1.28.8; do
-    sed -i "s/kubernetes.*-/kubernetes${version::4}-/g" org/k8s/kube-*/*
-    sed -i "s/$BRANCH = \[ \"v.*\" \]/$BRANCH = \[ \"v$version\" \]/g" tags.toml
-
-    if [ "$COMMAND" == 'build' ]; then
-        build "$@"
-    elif [ "$COMMAND" == 'push' ]; then
-        push "$@"
-    fi
-done
--- a/org/alt/apache2/Dockerfile.template
+++ b/org/alt/apache2/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="apache2"
-LABEL org.opencontainers.image.description="The most widely used Web server on the Internet"
-LABEL org.opencontainers.image.source="http://httpd.apache.org"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("apache2") }}
+{{ install_pakages("apache2") }}

 EXPOSE 80

--- a/org/alt/apache2/test
+++ b/org/alt/apache2/test
@ -1 +0,0 @@
-apachectl -v
--- a/org/alt/base/Dockerfile.template
+++ b/org/alt/base/Dockerfile.template
@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
+{{ install_pakages("glibc-gconv-modules", "glibc-locales", "tzdata") }}

 CMD ["bash"]
--- a/org/alt/base/test
+++ b/org/alt/base/test
@ -1 +0,0 @@
-LC_ALL=ru_RU.UTF-8 TZ=/usr/share/zoneinfo/Europe/Moscow date| grep MSK
--- a/org/alt/buildpack-deps-curl/Dockerfile.template
+++ b/org/alt/buildpack-deps-curl/Dockerfile.template
@ -2,13 +2,9 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="buildpack-deps-curl"
-LABEL org.opencontainers.image.licenses="GPLv2"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
+{{ install_pakages(
    "ca-certificates",
    "curl",
    "gnupg",
    "wget"
-) }}
+) }}
--- a/org/alt/buildpack-deps-curl/test
+++ b/org/alt/buildpack-deps-curl/test
@ -1 +0,0 @@
-curl --version && gpg --version
--- a/org/alt/buildpack-deps-scm/Dockerfile.template
+++ b/org/alt/buildpack-deps-scm/Dockerfile.template
@ -2,11 +2,8 @@ FROM {{ registry }}{{ organization }}/buildpack-deps-curl:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="buildpack-deps-scm"
-LABEL org.opencontainers.image.licenses="GPLv2"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_packages(
+{{ install_pakages(
    "git",
    "mercurial",
    "openssh-clients",
--- a/org/alt/buildpack-deps-scm/test
+++ b/org/alt/buildpack-deps-scm/test
@ -1 +0,0 @@
-git --version && hg --version
--- a/org/alt/buildpack-deps/Dockerfile.template
+++ b/org/alt/buildpack-deps/Dockerfile.template
@ -2,11 +2,7 @@ FROM {{ registry }}{{ organization }}/buildpack-deps-scm:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="buildpack-deps"
-LABEL org.opencontainers.image.licenses="GPLv2"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
+{{ install_pakages(
    "ImageMagick",
    "autoconf",
    "automake",
--- a/org/alt/buildpack-deps/test
+++ b/org/alt/buildpack-deps/test
@ -1 +0,0 @@
-gcc --version && make --version
--- a/org/alt/devel/Dockerfile.template
+++ b/org/alt/devel/Dockerfile.template
@ -2,33 +2,28 @@ FROM {{ registry }}{{ organization }}/base:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="devel"
-LABEL org.opencontainers.image.description="This image is only for devel or testing purposes"
-LABEL org.opencontainers.image.licenses="GPLv2"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
 # install editor
-{{ install_packages("vim-console") }}
+{{ install_pakages("vim-console") }}

 # install debugging tools
-{{ install_packages("strace", "gdb") }}
+{{ install_pakages("strace", "gdb") }}

 # install document viewers
-{{ install_packages("man") }}
+{{ install_pakages("man") }}

 # install version control system
-{{ install_packages("git-core", "perl-Git") }}
+{{ install_pakages("git-core", "perl-Git") }}

 # install network utils
-{{ install_packages("iproute2", "iputils", "wget", "curl") }}
+{{ install_pakages("iproute2", "iputils", "wget", "curl") }}

 # install file utils
-{{ install_packages("lsof", "ripgrep") }}
+{{ install_pakages("lsof", "ripgrep") }}

 # install shell and completions
-{{ install_packages("zsh", "zsh-completions") }}
+{{ install_pakages("zsh", "zsh-completions") }}

 # install compilation utils
-{{ install_packages("make", "gcc", "gcc-c++") }}
+{{ install_pakages("make", "gcc", "gcc-c++") }}

 CMD ["zsh"]
--- a/org/alt/devel/test
+++ b/org/alt/devel/test
@ -1 +0,0 @@
-man --version && ip -V && vim --version | grep vim
--- a/org/alt/distroless-builder/Dockerfile.template
+++ b/org/alt/distroless-builder/Dockerfile.template
@ -2,14 +2,9 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="distroless-builder"
-LABEL org.opencontainers.image.description="This images is using to build tarball for distroless images"
-LABEL org.opencontainers.image.licenses="GPLv2"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
 RUN echo %_excludedocs 1 >> /etc/rpm/macros
 RUN rpm -qalds | awk '/^normal/{print $2}' | xargs rm -rf
-{{ install_packages("python3", "glibc-utils", "apt-repo") }}
+{{ install_pakages("python3", "glibc-utils", "apt-repo") }}
 WORKDIR /usr/src/distroless
 RUN mkdir file-lists
 RUN useradd -m nonroot
--- a/org/alt/distroless-builder/test
+++ b/org/alt/distroless-builder/test
@ -1 +0,0 @@
-apt-repo --version
--- a/org/alt/distroless-devel/test
+++ b/org/alt/distroless-devel/test
@ -1 +0,0 @@
-ss -V
--- a/org/alt/etcd/Dockerfile.template
+++ b/org/alt/etcd/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="etcd"
-LABEL org.opencontainers.image.description="Distributed reliable key-value store for the most critical data of a distributed system"
-LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("etcd") }}
+{{ install_pakages("etcd") }}

 VOLUME /data

--- a/org/alt/etcd/test
+++ b/org/alt/etcd/test
@ -1 +0,0 @@
-etcdctl version
--- a/org/alt/gitea/Dockerfile.template
+++ b/org/alt/gitea/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="gitea"
-LABEL org.opencontainers.image.description="Git with a cup of tea, painless self-hosted git service"
-LABEL org.opencontainers.image.source="https://github.com/go-gitea/gitea"
-LABEL org.opencontainers.image.licenses="MIT"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("gitea", "openssh-server", "gosu") }}
+{{ install_pakages("gitea", "openssh-server", "gosu") }}

 ENV USER gitea
 ENV HOME /var/lib/gitea
--- a/org/alt/gitea/test
+++ b/org/alt/gitea/test
@ -1 +0,0 @@
-gitea --version
--- a/org/alt/nginx/Dockerfile.template
+++ b/org/alt/nginx/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="nginx"
-LABEL org.opencontainers.image.description="Fast HTTP server, extremely useful as an Apache frontend"
-LABEL org.opencontainers.image.source="https://nginx.org/"
-LABEL org.opencontainers.image.licenses="BSD"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("nginx", "apache2-html", "tzdata") }}
+{{ install_pakages("nginx", "apache2-html", "tzdata") }}

 RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .

--- a/org/alt/nginx/test
+++ b/org/alt/nginx/test
@ -1 +0,0 @@
-nginx -v
--- a/org/alt/node/Dockerfile.template
+++ b/org/alt/node/Dockerfile.template
@ -2,16 +2,10 @@ FROM {{ registry }}{{ organization }}/buildpack-deps:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="node"
-LABEL org.opencontainers.image.description="Evented I/O for V8 Javascript"
-LABEL org.opencontainers.image.source="https://github.com/nodejs/node"
-LABEL org.opencontainers.image.licenses="MIT"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
 RUN groupadd --gid 1000 node \
    && useradd --uid 1000 --gid node --shell /bin/bash --create-home node

-{{ install_packages(
+{{ install_pakages(
    "node",
    "npm",
    "yarn"
--- a/org/alt/node/test
+++ b/org/alt/node/test
@ -1 +0,0 @@
-node -v
--- a/org/alt/prometheus/Dockerfile.template
+++ b/org/alt/prometheus/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="prometheus"
-LABEL org.opencontainers.image.description="Prometheus monitoring system and time series database"
-LABEL org.opencontainers.image.source="https://github.com/prometheus/prometheus"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("prometheus") }}
+{{ install_pakages("prometheus") }}

 WORKDIR /var/lib/prometheus
 USER prometheus
--- a/org/alt/prometheus/test
+++ b/org/alt/prometheus/test
@ -1 +0,0 @@
-prometheus --version
--- a/org/alt/python/Dockerfile.template
+++ b/org/alt/python/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ organization }}/base:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="python"
-LABEL org.opencontainers.image.description="Python 3 and tools needed for development"
-LABEL org.opencontainers.image.source="https://github.com/python/cpython"
-LABEL org.opencontainers.image.licenses="Python"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
+{{ install_pakages(
    "python3-module-pip",
    "python3-module-setuptools",
    "python3-dev",
--- a/org/alt/python/test
+++ b/org/alt/python/test
@ -1 +0,0 @@
-python3 --version
--- a/org/alt/registry/Dockerfile.template
+++ b/org/alt/registry/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="registry"
-LABEL org.opencontainers.image.description="The Docker toolset to pack, ship, store, and deliver content"
-LABEL org.opencontainers.image.source="https://github.com/docker/distribution"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("docker-registry") }}
+{{ install_pakages("docker-registry") }}

 RUN ln -sf /usr/bin/docker-registry /bin/registry

--- a/org/alt/registry/test
+++ b/org/alt/registry/test
@ -1 +0,0 @@
-registry --version
--- a/org/alt/ruby/Dockerfile.template
+++ b/org/alt/ruby/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="ruby"
-LABEL org.opencontainers.image.description="Interactive Ruby Shell"
-LABEL org.opencontainers.image.source="https://github.com/ruby/ruby"
-LABEL org.opencontainers.image.licenses="BSD-2-Clause or Ruby"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("irb") }}
+{{ install_pakages("irb") }}

 CMD ["irb"]
--- a/org/alt/ruby/test
+++ b/org/alt/ruby/test
@ -1 +0,0 @@
-ruby --version
--- a/org/alt/systemd/Dockerfile.template
+++ b/org/alt/systemd/Dockerfile.template
@ -2,15 +2,9 @@ FROM {{ registry }}{{ organization }}/base:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="systemd"
-LABEL org.opencontainers.image.description="Systemd System V init tools"
-LABEL org.opencontainers.image.source="https://github.com/systemd/systemd"
-LABEL org.opencontainers.image.licenses="LGPLv2.1+"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
 ENV container docker

-{{ install_packages("systemd-sysvinit") }}
+{{ install_pakages("systemd-sysvinit") }}

 RUN ( \
        cd /lib/systemd/system/sysinit.target.wants/; \
--- a/org/alt/systemd/test
+++ b/org/alt/systemd/test
@ -1 +0,0 @@
-ls -la /sbin/init | grep systemd
--- a/org/alt/unit/Dockerfile.template
+++ b/org/alt/unit/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="unit"
-LABEL org.opencontainers.image.description="NGINX Unit is a lightweight and versatile web-server"
-LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
 RUN apt-get update && \
    apt-get install -y unit curl tzdata; \
    rm -f /var/cache/apt/archives/*.rpm \
--- a/org/alt/unit/test
+++ b/org/alt/unit/test
@ -1 +0,0 @@
-unitd --version
--- a/org/alt/zot/Dockerfile.template
+++ b/org/alt/zot/Dockerfile.template
@ -1,19 +0,0 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="zot"
-LABEL org.opencontainers.image.description="A production-ready vendor-neutral OCI-native container image registry (purely based on OCI Distribution Specification)"
-LABEL org.opencontainers.image.source="https://github.com/project-zot/zot"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("zot") }}
-
-USER _zot:_zot
-
-VOLUME ["/var/lib/zot"]
-EXPOSE 5000
-
-ENTRYPOINT ["/usr/bin/zot"]
-CMD ["serve", "/etc/zot/config.json"]
--- a/org/alt/zot/test
+++ b/org/alt/zot/test
@ -1 +0,0 @@
-zot verify /etc/zot/config.json
--- a/org/k8s/cert-manager-cainjector/Dockerfile.template
+++ b/org/k8s/cert-manager-cainjector/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="cert-manager-cainjector"
-LABEL org.opencontainers.image.description="Cainjector component for automatic provisioning and managing TLS certificates in Kubernetes"
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("cert-manager") }}
+{{ install_pakages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-cainjector/test
+++ b/org/k8s/cert-manager-cainjector/test
@ -1 +0,0 @@
-cainjector --help
--- a/org/k8s/cert-manager-controller/Dockerfile.template
+++ b/org/k8s/cert-manager-controller/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="cert-manager-controller"
-LABEL org.opencontainers.image.description="Controller component for automatic provisioning and managing TLS certificates in Kubernetes"
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("cert-manager") }}
+{{ install_pakages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-controller/test
+++ b/org/k8s/cert-manager-controller/test
@ -1 +0,0 @@
-controller --help
--- a/org/k8s/cert-manager-webhook/Dockerfile.template
+++ b/org/k8s/cert-manager-webhook/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="cert-manager-webhook"
-LABEL org.opencontainers.image.description="Webhook component for automatic provisioning and managing TLS certificates in Kubernetes"
-LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-manager"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("cert-manager") }}
+{{ install_pakages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-webhook/test
+++ b/org/k8s/cert-manager-webhook/test
@ -1 +0,0 @@
-webhook --help
--- a/org/k8s/coredns/Dockerfile.template
+++ b/org/k8s/coredns/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="coredns"
-LABEL org.opencontainers.image.description="CoreDNS is a DNS server that chains plugins"
-LABEL org.opencontainers.image.source="https://github.com/coredns/coredns"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("coredns") }}
+{{ install_pakages("coredns") }}

 ENTRYPOINT ["/usr/bin/coredns"]
--- a/org/k8s/coredns/test
+++ b/org/k8s/coredns/test
@ -1 +0,0 @@
-coredns --version
--- a/org/k8s/etcd/Dockerfile.template
+++ b/org/k8s/etcd/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="etcd"
-LABEL org.opencontainers.image.description="Distributed reliable key-value store for the most critical data of a distributed system"
-LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("etcd") }}
+{{ install_pakages("etcd") }}

 VOLUME /data

--- a/org/k8s/etcd/test
+++ b/org/k8s/etcd/test
@ -1 +0,0 @@
-etcd --version
--- a/org/k8s/flannel-cni-plugin/Dockerfile.template
+++ b/org/k8s/flannel-cni-plugin/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="flannel-cni-plugin"
-LABEL org.opencontainers.image.description="CNI network plugin that is powered by flannel"
-LABEL org.opencontainers.image.source="https://github.com/flannel-io/cni-plugin"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("cni-plugin-flannel") }}
+{{ install_pakages("cni-plugin-flannel") }}

 RUN cp /usr/libexec/cni/flannel /flannel
--- a/org/k8s/flannel/Dockerfile.template
+++ b/org/k8s/flannel/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="flannel"
-LABEL org.opencontainers.image.description="Network fabric for containers"
-LABEL org.opencontainers.image.source="https://github.com/flannel-io/flannel"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
+{{ install_pakages(
    "iproute2",
    "net-tools",
    "ca-certificates",
--- a/org/k8s/flannel/test
+++ b/org/k8s/flannel/test
@ -1 +0,0 @@
-flanneld --version
--- a/org/k8s/ingress-nginx-controller/Dockerfile.template
+++ b/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"]
--- a/org/k8s/kube-apiserver/Dockerfile.template
+++ b/org/k8s/kube-apiserver/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-apiserver"
-LABEL org.opencontainers.image.description="The Kubernetes API server validates and configures data for the api objects which include pods, services, replicationcontrollers, and others."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-master") }}
+{{ install_pakages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-apiserver"]
--- a/org/k8s/kube-apiserver/test
+++ b/org/k8s/kube-apiserver/test
@ -1 +0,0 @@
-kube-apiserver --version
--- a/org/k8s/kube-controller-manager/Dockerfile.template
+++ b/org/k8s/kube-controller-manager/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-controller-manager"
-LABEL org.opencontainers.image.description="The Kubernetes controller manager is a daemon that embeds the core control loops shipped with Kubernetes."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-master") }}
+{{ install_pakages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-controller-manager"]
--- a/org/k8s/kube-controller-manager/test
+++ b/org/k8s/kube-controller-manager/test
@ -1 +0,0 @@
-kube-controller-manager --version
--- a/org/k8s/kube-proxy/Dockerfile.template
+++ b/org/k8s/kube-proxy/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-proxy"
-LABEL org.opencontainers.image.description="The Kubernetes network proxy runs on each node."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-node") }}
+{{ install_pakages("kubernetes-node") }}

 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy

--- a/org/k8s/kube-proxy/test
+++ b/org/k8s/kube-proxy/test
@ -1 +0,0 @@
-kube-proxy --version
--- a/org/k8s/kube-scheduler/Dockerfile.template
+++ b/org/k8s/kube-scheduler/Dockerfile.template
@ -2,12 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="kube-scheduler"
-LABEL org.opencontainers.image.description="The Kubernetes scheduler is a control plane process which assigns Pods to Nodes."
-LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kubernetes-master") }}
+{{ install_pakages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-scheduler"]
--- a/org/k8s/kube-scheduler/test
+++ b/org/k8s/kube-scheduler/test
@ -1 +0,0 @@
-kube-scheduler --version
--- a/org/k8s/pause/Dockerfile.template
+++ b/org/k8s/pause/Dockerfile.template
@ -1,6 +1,6 @@
 FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer

-{{ install_packages("kubernetes-pause") }}
+{{ install_pakages("kubernetes-pause") }}

 FROM scratch

--- a/org/k8s/trivy-node-collector/Dockerfile.template
+++ b/org/k8s/trivy-node-collector/Dockerfile.template
@ -2,13 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="trivy-node-collector"
-LABEL org.opencontainers.image.description="Open source collector who collect Node information (fs and process data) and output in a table/json format"
-LABEL org.opencontainers.image.source="https://github.com/aquasecurity/k8s-node-collector"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
+{{ install_pakages(
    "k8s-trivy-node-collector"
 ) }}

--- a/org/k8s/trivy-node-collector/test
+++ b/org/k8s/trivy-node-collector/test
@ -1 +0,0 @@
-node-collector --help
--- a/tags.toml
+++ b/tags.toml
@ -1,77 +1,50 @@
 ["k8s/kube-apiserver"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/kube-controller-manager"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/kube-scheduler"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/kube-proxy"]
-p10 = [ "v1.28.9" ]
-sisyphus = [ "v1.28.9" ]
-c10f1 = [ "v1.26.15" ]
-c10f2 = [ "v1.26.15" ]
+p10 = [ "v1.26.9" ]
+sisyphus = [ "v1.26.9" ]

 ["k8s/pause"]
 p10 = [ "3.9" ]
 sisyphus = [ "3.9" ]
-c10f1 = [ "3.9" ]
-c10f2 = [ "3.9" ]

 ["k8s/etcd"]
-p10 = [ "3.5.12-0" ]
-sisyphus = [ "3.5.12-0" ]
-c10f1 = [ "3.5.9-0" ]
-c10f2 = [ "3.5.9-0" ]
+p10 = [ "3.5.6-0" ]
+sisyphus = [ "3.5.6-0" ]

 ["k8s/coredns"]
-p10 = [ "v1.10.1" ]
-sisyphus = [ "v1.10.1" ]
-c10f1 = [ "v1.9.3" ]
-c10f2 = [ "v1.9.3" ] 
+p10 = [ "v1.9.3" ]
+sisyphus = [ "v1.9.3" ]

 ["k8s/cert-manager-cainjector"]
 p10 = [ "v1.9.1" ]
 sisyphus = [ "v1.11.0" ]
-c10f1 = [ "v1.9.1" ]
-c10f2 = [ "v1.9.1" ]

 ["k8s/cert-manager-controller"]
 p10 = [ "v1.9.1" ]
 sisyphus = [ "v1.11.0" ]
-c10f1 = [ "v1.9.1" ]
-c10f2 = [ "v1.9.1" ]

 ["k8s/cert-manager-webhook"]
 p10 = [ "v1.9.1" ]
 sisyphus = [ "v1.11.0" ]
-c10f1 = [ "v1.9.1" ]
-c10f2 = [ "v1.9.1" ]

 ["k8s/flannel"]
 p10 = [ "v0.21.4" ]
-sisyphus = [ "v0.24.2" ]
-c10f1 = [ "v0.21.4" ]
-c10f2 = [ "v0.21.4" ]
+sisyphus = [ "v0.22.3" ]

 ["k8s/flannel-cni-plugin"]
 p10 = [ "v1.1.2" ]
 sisyphus = [ "v1.2.0" ]
-c10f1 = [ "v1.1.2" ]
-c10f2 = [ "v1.1.2" ]

-["k8s/trivy-node-collector"]
-p10 = [ "0.0.9" ]
-sisyphus = [ "0.0.9" ]
-c10f1 = [ "0.0.9" ]
-c10f2 = [ "0.0.9" ]
+["k8s/ingress-nginx-controller"]
+sisyphus = [ "v1.8.1" ]
--- a/tasks.toml
+++ b/tasks.toml
@ -0,0 +1,2 @@
+[sisyphus]
+325528 = [ "k8s/ingress-nginx-controller" ]
				`@ -1 +0,0 @@`
				`LC_ALL=ru_RU.UTF-8 TZ=/usr/share/zoneinfo/Europe/Moscow date\| grep MSK`
				`@ -1 +0,0 @@`
				`man --version && ip -V && vim --version \| grep vim`