Delete unused files

- cert-manager-startupapicheck
- cert-manager-acmesolver

.gitea/workflows/wf_full_p10.yaml

@@ -0,0 +1,133 @@
+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 [[ $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 }}

.gitea/workflows/wf_full_p11.yaml

@@ -0,0 +1,126 @@
+name: Full building alt images
+on:
+  push:
+    tags:
+      - 'p11_*'
+
+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 [[ $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 }}

.gitea/workflows/wf_full_sis.yaml

@@ -55,7 +55,6 @@ jobs:
         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
@@ -66,12 +65,10 @@ jobs:
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}
         run: |
-          issueid=$(curl -X 'GET' "$URL/api/v1/repos/$REPO/image-forge/issues?state=open&labels=building&type=issues&page=1&limit=1&token=$T" -H 'accept: application/json' -s | jq '.[].number' -r)
-          if [[ $issueid != '' ]]; then \
-            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"; \
-          else echo "no issue to send notification"; fi
+          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 }}
@@ -117,13 +114,11 @@ jobs:
       - name: Send notification if test crashed
         if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
         run: |
-          issueid=$(curl -X 'GET' "$URL/api/v1/repos/$REPO/image-forge/issues?state=open&labels=building&type=issues&page=1&limit=1&token=$T" -H 'accept: application/json' -s | jq '.[].number' -r)
-          if [[ $issueid != '' ]]; then \
-            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"; \
-          else echo "no issue to send notification"; fi               
+          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 }}

README.md

@@ -29,6 +29,7 @@ If you push to the users repository, then organiztion is your username.
 ## Dependencies
 On x86_64 machine using p10 branch you need:
 - `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

branch/README.md

@@ -1,153 +0,0 @@
-# Описание структуры каталогов для автоматизации рабочео процесса создания образов
-
-## Общая структура каталогов 
-
-- Вместо каталога `org` предлагается использовать каталог `branch`
-
-- Каталог `branch` содержит подкаталога бранчей (платформ):
-  * `sisyphus`;
-  * `p10`;
-  * `c10f1`;
-  * `c10f2`;
-  * ...
-
-Подкаталоги бранчей содержат дерево групп образов.
-
-Корневая группа `base` содержит образы, которые тегируются по дате создания.
-Остальные группы тегируются по версии основного ПО, входящего в состав образа.
-
-Каталог группы может содержать yml-файл `images.yml` описания группы.
-
-Пример дерева описания образов:  
-<pre>
-branch/sisyphus/
-├── apache
-├── base
-│   ├── alt
-│   ├── buildpack
-│   │   ├── buildpack-deps-curl
-│   │   └── buildpack-deps-scm
-│   ├── devel
-│   ├── distroless
-│   │   ├── distroless-base
-│   │   ├── distroless-builder
-│   │   ├── distroless-devel
-│   │   ├── distroless-gotop
-│   │   ├── distroless-static
-│   │   └── distroless-true
-│   ├── systemd
-│   └── unit
-├── cert-manager
-│   ├── cert-manager-cainjector
-│   ├── cert-manager-controller
-│   └── cert-manager-webhook
-├── cni
-│   └── flannel
-│       ├── flannel
-│       └── flannel-cni-plugin
-├── gitea
-├── k8s
-│   ├── coredns
-│   ├── deckhouse
-│   │   ├── coredns
-│   │   ├── etcd
-│   │   ├── kube-apiserver
-│   │   ├── kube-controller-manager
-│   │   ├── kube-proxy
-│   │   ├── kube-scheduler
-│   │   └── pause
-│   ├── etcd
-│   ├── kube-apiserver
-│   ├── kube-controller-manager
-│   ├── kube-proxy
-│   ├── kube-scheduler
-│   └── pause
-├── nginx
-├── prometheus
-├── python
-├── registry
-├── ruby
-└── trivy
-    └── trivy-node-collector
-</pre>
-
-Конечный каталог дерева содержит файлы:
-
-- **`Dockerfile`** - файл для сборки образа;
-
-- **`image.yml`** - файл описания метаданных для образа. 
-
-Кроме этого конечный каталог может содержать файлы и каталоги, которые помещаются в образ командами `COPY` и `ADD`. 
-
-Все вышележащие до каталога конкретного бранча (`sisyphus`, `p10`, `c10f1`, `c10f2`, ...) описывают группу (возможно пустую), в которую входит образ.
-
-Имя образа формируется как тропа дерева каталогов.
-Например:
-- `sisyphus/apache`
-- `sisyphus/k8s/kube-apiserver` 
-
-Имя тега берется либо из файла `image.yml` описания образа, либо из файла описания группы `images.yml`.
-
-## Конечный каталог описания образа
-
-###  Dockerfile
-
-Предлагается заменить шаблон `Dockerfile.template` заменить на нативный `Dockerfile`.
-Все параметры, подставляемые функцией `render_dockerfiles` скрипта   
-[/build.py](https://gitea.basealt.ru/alt/image-forge/src/branch/feature-new-layout/build.py#L249)
-заменяются на аргументы (`ARG`), инициализируемые непосредственно в `Dockerfile`или передаваемые (с заиещением) при сборко образа параметрами `--build-arg="<ARG>=<VALUE>"`.
-
-За исключением шаблона `{{ install_pakages("<пакет>" ...) }}`
-  
-Предлагается во все базовые дистрибутивы включить `shell-скрипт` `alt_install_pakages`, выполняющий функции аналогичные 
-python-функции [install_pakages](https://gitea.basealt.ru/alt/image-forge/src/branch/feature-new-layout/build.py#L250).
-
-Шаблон `{{ install_pakages("<пакет>" ...) }}` заменяется в `Dockerfile` оператором:
-```
-RUN alt_install_pakages <пакет> ...
-``` 
-
-Пример файла образа `sisyphus/k8s/kube-apiserver`:
-<pre>
-ARG BRANCH REGISTRY=gitea.basealt.ru ALT_IMAGE=base/alt:$BRANCH MAINTAINER=alt-cloud ALT_TESTSCRIPT=/bin/true
-
-FROM $REGISTRY/$ALT_IMAGE:$BRANCH
-
-MAINTAINER $MAINTAINER
-
-LABEL  org.altlinux.testscript=$ALT_TESTSCRIPT
-
-RUN alt_install_pakages kubernetes-master
-
-ENTRYPOINT ["/usr/bin/kube-apiserver"]
-</pre>
-
-### Файл image.yml описания метаданных для образа
-
-В настоящий момент он содержит (жирным шрифтом обязательные элементы):
-
-* **`image.maintainer`** - E-mail майнтейнера для создания и проверки электронной подписи образа;
- 
-* `image.alias` - список возможных алиасов образа;
-
-* `image.tag` - тер образа (может при сборке перекрываться тегом, взятым из вышележащего файла `images.yml` описания группы)
-  
-* `image.labels` - список дополнительных метов образа, в частности:
-  
-  - `org.altlinux.testscript` - shell код для тестоиования образа при его запуске в режиме `podman ... -it --- <образ>`
-
-Пример файла образа `sisyphus/k8s/kube-apiserver`:
-<pre>
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru
-</pre>
-
-
-## Каталог  группы
-
-### Файл `images.yml` описания метаданных группы

branch/sisyphus/k8s/coredns/image.yml

@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru

branch/sisyphus/k8s/images.yml

@@ -1,41 +0,0 @@
-version: 1.0
-imageSet:
-  listCmd: ...
-
-  - version: 1.26.9
-    images:
-      - kube-apiserver:
-          tag: 1.26.9
-      - kube-controllermanager:
-          tag: 1.26.9
-      - kube-proxy:
-          tag: 1.26.9
-      - kube-scheduler:
-          tag: 1.26.9
-      - pause:
-          tag: 3.8
-      - coredns:
-          tag: v1.10.0
-      - etcd:
-          tag: 3.5.9
-          alias:
-          - alt/etcd:3.5.9
-
-  - version: 1.26.14
-    images:
-      - kube-apiserver:
-          tag: 1.26.14
-      - kube-controllermanager:
-          tag: 1.26.14
-      - kube-proxy:
-          tag: 1.26.14
-      - kube-scheduler:
-          tag: 1.26.14
-      - pause:
-          tag: 3.9
-      - coredns:
-          tag: v1.10.0
-      - etcd:
-          tag: 3.5.10
-          alias:
-          - alt/etcd:3.5.10

branch/sisyphus/k8s/kube-apiserver/image.yml

@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru

branch/sisyphus/k8s/kube-controller-manager/image.yml

@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru

branch/sisyphus/k8s/kube-proxy/image.yml

@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru

branch/sisyphus/k8s/kube-scheduler/image.yml

@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru

branch/sisyphus/k8s/pause/image.yml

@@ -1,7 +0,0 @@
-version: 1.0
-image:
-  alias:
-  - k8s-${BRANCH}/${IMAGE}:${TAG}
-  labels:
-    org.altlinux.testscript: /bin/true
-  maintainer: stepchenkoas@basealt.ru

build.py

@@ -225,7 +225,7 @@ class DockerBuilder:
         self,
         template: str,
         organization: str,
-        install_pakages=None,
+        install_packages=None,
         **kwargs,
     ) -> str:
         if self.registry:
@@ -237,7 +237,7 @@ class DockerBuilder:
         rendered = Template(template).render(
             alt_image=alt_image,
             branch=self.branch,
-            install_pakages=install_pakages,
+            install_packages=install_packages,
             organization=organization,
             registry=registry,
             **kwargs,
@@ -247,7 +247,7 @@ class DockerBuilder:
 
     @forall_images(consume_result=True)
     def render_dockerfiles(self, **kwargs):
-        def install_pakages(*names):
+        def install_packages(*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_pakages,
+                install_packages,
             )
             kwargs["dockerfile"].write_text(rendered + "\n")
 
@@ -638,8 +638,8 @@ class ImagesInfo:
 
 def parse_args():
     stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
-    arches = ["amd64", "386", "arm64", "arm", "ppc64le"]
-    branches = ["p9", "p10", "sisyphus"]
+    arches = ["amd64", "386", "arm64"]
+    branches = ["p11", "p10", "sisyphus", "c10f1", "c10f2"]
     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,7 +654,8 @@ def parse_args():
         nargs="+",
         default=images,
         choices=images,
-        help="list of branches",
+        metavar="IMAGE_NAME",
+        help="list of images to build",
     )
     images_group.add_argument(
         "-o",
@@ -664,6 +665,14 @@ 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",
@@ -696,27 +705,20 @@ 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="list of arches",
+        help="build images for these architectures",
     )
     parser.add_argument(
         "--skip-arches",
         nargs="+",
         default=[],
         choices=arches,
-        help="list of skipping arches",
+        help="list of architectures to skip",
     )
     parser.add_argument(
         "-b",
@@ -724,28 +726,28 @@ def parse_args():
         nargs="+",
         default=branches,
         choices=branches,
-        help="list of branches",
+        help="build images for these branches",
     )
     parser.add_argument(
         "--skip-branches",
         nargs="+",
         default=[],
         choices=branches,
-        help="list of skipping branches",
+        help="list of branches to skip",
     )
     parser.add_argument(
         "--stages",
         nargs="+",
         default=stages,
         choices=stages,
-        help="list of stages",
+        help="list of stages to go through",
     )
     parser.add_argument(
         "--skip-stages",
         nargs="+",
         default=[],
         choices=stages,
-        help="list of skipping stages",
+        help="list of stages to skip",
     )
     args = parser.parse_args()
 

org/alt/apache2/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages("apache2") }}
+{{ install_packages("apache2") }}
 
 EXPOSE 80
 

org/alt/base/Dockerfile.template

@@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-{{ install_pakages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
+{{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
 
 CMD ["bash"]

org/alt/buildpack-deps-curl/Dockerfile.template

@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-curl"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{{ install_pakages(
+{{ install_packages(
     "ca-certificates",
     "curl",
     "gnupg",

org/alt/buildpack-deps-scm/Dockerfile.template

@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-scm"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{{ install_pakages(
+{{ install_packages(
     "git",
     "mercurial",
     "openssh-clients",

org/alt/buildpack-deps/Dockerfile.template

@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{{ install_pakages(
+{{ install_packages(
     "ImageMagick",
     "autoconf",
     "automake",

org/alt/devel/Dockerfile.template

@@ -8,27 +8,27 @@ LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 # install editor
-{{ install_pakages("vim-console") }}
+{{ install_packages("vim-console") }}
 
 # install debugging tools
-{{ install_pakages("strace", "gdb") }}
+{{ install_packages("strace", "gdb") }}
 
 # install document viewers
-{{ install_pakages("man") }}
+{{ install_packages("man") }}
 
 # install version control system
-{{ install_pakages("git-core", "perl-Git") }}
+{{ install_packages("git-core", "perl-Git") }}
 
 # install network utils
-{{ install_pakages("iproute2", "iputils", "wget", "curl") }}
+{{ install_packages("iproute2", "iputils", "wget", "curl") }}
 
 # install file utils
-{{ install_pakages("lsof", "ripgrep") }}
+{{ install_packages("lsof", "ripgrep") }}
 
 # install shell and completions
-{{ install_pakages("zsh", "zsh-completions") }}
+{{ install_packages("zsh", "zsh-completions") }}
 
 # install compilation utils
-{{ install_pakages("make", "gcc", "gcc-c++") }}
+{{ install_packages("make", "gcc", "gcc-c++") }}
 
 CMD ["zsh"]

org/alt/distroless-builder/Dockerfile.template

@@ -3,13 +3,13 @@ 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.description="This image is used to build tarballs 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_pakages("python3", "glibc-utils", "apt-repo") }}
+{{ install_packages("python3", "glibc-utils", "apt-repo") }}
 WORKDIR /usr/src/distroless
 RUN mkdir file-lists
 RUN useradd -m nonroot

org/alt/distroless-builder/README.md

@@ -1,3 +1,3 @@
 ALT dockerfile for distroless-builder image.
 
-This images is using to build tarball for distroless images.
+This image is used to build tarballs for distroless images.

org/alt/etcd/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages("etcd") }}
+{{ install_packages("etcd") }}
 
 VOLUME /data
 

org/alt/gitea/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages("gitea", "openssh-server", "gosu") }}
+{{ install_packages("gitea", "openssh-server", "gosu") }}
 
 ENV USER gitea
 ENV HOME /var/lib/gitea

org/alt/golang/Dockerfile.template

@@ -0,0 +1,11 @@
+FROM {{ registry }}{{ organization }}/base:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="golang"
+LABEL org.opencontainers.image.description="The Golang environment for development"
+LABEL org.opencontainers.image.source="https://github.com/golang/go"
+LABEL org.opencontainers.image.licenses="BSD"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("golang") }}

org/alt/grafana/Dockerfile.template

@@ -0,0 +1,22 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="grafana"
+LABEL org.opencontainers.image.description="Metrics dashboard and graph editor"
+LABEL org.opencontainers.image.source="https://github.com/grafana/grafana"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-only AND Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("grafana") }}
+
+USER grafana
+EXPOSE 3000
+VOLUME ["/var/lib/grafana"]
+
+ENV GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+ENV GF_AUTH_ANONYMOUS_ENABLED=true
+ENV GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+
+ENTRYPOINT [ "/usr/bin/grafana" ]
+CMD [ "server", "--config=/etc/grafana/grafana.ini", "--homepath=/usr/share/grafana", "--packaging=docker", "-configOverrides='cfg:default.paths.provisioning=/etc/grafana/provisioning cfg:default.paths.data=/var/lib/grafana cfg:default.paths.logs=/var/log/grafana cfg:default.paths.plugins=/var/lib/grafana/plugins'" ]

org/alt/grafana/README.md

@@ -0,0 +1,6 @@
+# Prometheus image
+
+Command for run:
+```
+docker run -d --name="grafana" -p 3000:3000 -v grafana-data:/var/lib/grafana IMAGENAME
+```

org/alt/loki/Dockerfile.template

@@ -0,0 +1,19 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="loki"
+LABEL org.opencontainers.image.description="Like Prometheus, but for logs"
+LABEL org.opencontainers.image.source="https://github.com/grafana/loki"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("loki") }}
+
+USER _loki:_loki
+
+VOLUME ["/var/lib/loki", "/etc/loki/loki.yml"]
+EXPOSE 3100
+
+ENTRYPOINT ["/usr/bin/loki"]
+CMD ["-config.file=/etc/loki/loki.yaml"]

org/alt/loki/README.md

@@ -0,0 +1,6 @@
+# Prometheus image
+
+Command for run:
+```
+docker run -d --name="loki" -p 3100:3100 -v loki-data:/var/lib/loki -v loki-config:/etc/loki/loki.yaml IMAGENAME
+```

org/alt/nginx/Dockerfile.template

@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://nginx.org/"
 LABEL org.opencontainers.image.licenses="BSD"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{{ install_pakages("nginx", "apache2-html", "tzdata") }}
+{{ install_packages("nginx", "apache2-html", "tzdata") }}
 
 RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .
 

org/alt/node/Dockerfile.template

@@ -11,7 +11,7 @@ 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_pakages(
+{{ install_packages(
     "node",
     "npm",
     "yarn"

org/alt/php/Dockerfile.template

@@ -0,0 +1,14 @@
+FROM {{ registry }}{{ organization }}/base:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="php"
+LABEL org.opencontainers.image.description="The PHP language environment for development"
+LABEL org.opencontainers.image.source="https://github.com/php/php-src"
+LABEL org.opencontainers.image.licenses="PHP-3.01"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages(
+"php8.2",
+"php8.2-xdebug",
+) }}

org/alt/prometheus-alertmanager/Dockerfile.template

@@ -0,0 +1,20 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="alertmanager"
+LABEL org.opencontainers.image.description="The Alertmanager handles alerts sent by client applications"
+LABEL org.opencontainers.image.source="https://github.com/prometheus/alertmanager"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("prometheus-alertmanager") }}
+
+WORKDIR /var/lib/prometheus/alertmanager
+RUN useradd -r -u 10001 alertmanager
+RUN usermod -a -G prometheus alertmanager
+USER alertmanager
+EXPOSE     9093
+VOLUME     [ "/var/lib/prometheus/alertmanager" ]
+ENTRYPOINT [ "/usr/bin/prometheus/alertmanager" ]
+CMD [ "--config.file=/etc/prometheus/alertmanager.yml" ]

org/alt/prometheus-alertmanager/README.md

@@ -0,0 +1,11 @@
+# Prometheus alertmanager image
+
+Command for run:
+```
+docker run -d --name="alertmanager" -p 9093:9093 -v promdata-am:/var/lib/prometheus/alertmanager IMAGENAME
+```
+
+*If you want to be able to view services on localhost, instead of -p, specify the flag:
+```
+--network="host"
+```

org/alt/prometheus-node_exporter/Dockerfile.template

@@ -0,0 +1,19 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="prometheus-node_exporter"
+LABEL org.opencontainers.image.description="Prometheus exporter for hardware and OS metrics exposed by *NIX kernels"
+LABEL org.opencontainers.image.source="https://github.com/prometheus/node_exporter"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("prometheus-node_exporter") }}
+
+WORKDIR /var/lib/prometheus/node-exporter
+RUN useradd -r -u 10001 node_exporter
+RUN usermod -a -G prometheus node_exporter
+USER node_exporter
+EXPOSE 9100
+VOLUME [ "/var/lib/prometheus/node-exporter" ]
+ENTRYPOINT [ "/usr/bin/prometheus-node_exporter" ]

org/alt/prometheus-node_exporter/README.md

@@ -0,0 +1,11 @@
+# Prometheus node_exporter image
+
+Command for run:
+```
+docker run -d --name="prometheus-node_exporter" -p 9100:9100 -v promdata-ne:/var/lib/prometheus/node-exporter IMAGENAME
+```
+
+*If you want to be able to view services on localhost, instead of -p, specify the flag:
+```
+--network="host"
+```

org/alt/prometheus/Dockerfile.template

@@ -8,10 +8,11 @@ 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_pakages("prometheus") }}
+{{ install_packages("prometheus") }}
 
 WORKDIR /var/lib/prometheus
 USER prometheus
 EXPOSE     9090
 VOLUME     [ "/var/lib/prometheus" ]
-ENTRYPOINT [ "/usr/bin/prometheus", "--config.file=/etc/prometheus/prometheus.yml"]
+ENTRYPOINT [ "/usr/bin/prometheus" ]
+CMD [ "--config.file=/etc/prometheus/prometheus.yml" ]

org/alt/python/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages(
+{{ install_packages(
     "python3-module-pip",
     "python3-module-setuptools",
     "python3-dev",

org/alt/python2/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ organization }}/base:{{ branch }}
+
+MAINTAINER alt-cloud
+ 
+LABEL org.opencontainers.image.title="python"
+LABEL org.opencontainers.image.description="Python 2 and tools needed for development"
+LABEL org.opencontainers.image.source="https://www.python.org/downloads/source"
+LABEL org.opencontainers.image.licenses="Python-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages(
+    "python-module-setuptools", 
+    "python-dev", 
+    "gcc",
+) }}
+
+CMD ["python2"] 

org/alt/python2/README.md

@@ -0,0 +1,13 @@
+dockerfiles-alt-python
+=======================
+
+ALT dockerfile for python.
+
+Image contains python(2) and tools to get upstream python modules. Main purpose
+of the image is to run python apps using upstream modules.
+
+Copy Dockerfile somewhere and build the image:
+`$ docker build --rm -t <image_name> .`
+
+And launch the python container:
+`docker run -it <image_name>`

org/alt/registry/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages("docker-registry") }}
+{{ install_packages("docker-registry") }}
 
 RUN ln -sf /usr/bin/docker-registry /bin/registry
 

org/alt/ruby/Dockerfile.template

@@ -8,6 +8,6 @@ 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_pakages("irb") }}
+{{ install_packages("irb") }}
 
 CMD ["irb"]

org/alt/systemd/Dockerfile.template

@@ -3,14 +3,14 @@ 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.description="System and Session Manager"
 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_pakages("systemd-sysvinit") }}
+{{ install_packages("systemd-sysvinit") }}
 
 RUN ( \
         cd /lib/systemd/system/sysinit.target.wants/; \

org/alt/trivy/Dockerfile.template

@@ -0,0 +1,13 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="trivy"
+LABEL org.opencontainers.image.description="A Fast Vulnerability Scanner for Containers"
+LABEL org.opencontainers.image.source="https://aquasecurity.github.io/trivy"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("trivy") }}
+
+ENTRYPOINT [ "trivy" ]

org/alt/trivy/README.md

@@ -0,0 +1,10 @@
+dockerfiles-alt-trivy
+=====================
+
+ALT dockerfile for trivy.
+
+Copy dockerfile somewhere and built the image:
+`$ docker build --rm -t <username>/trivy .`
+
+And launch the trivy container
+`$ docker run -it <username>/trivy`

org/alt/trivy/test

@@ -0,0 +1 @@
+trivy --version

org/alt/zot/Dockerfile.template

@@ -0,0 +1,19 @@
+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"]

org/alt/zot/test

@@ -0,0 +1 @@
+zot verify /etc/zot/config.json

org/flux2/helm-controller/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="flux2-helm-controller"
+LABEL org.opencontainers.image.description="Kubernetes operator, allowing one to declaratively manage Helm chart releases."
+LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+RUN echo "rpm http://git.altlinux.org repo/353490/x86_64 task" > /etc/apt/sources.list
+
+{{ install_packages("flux2-helm-controller") }}
+
+USER 65534:65534
+
+ENTRYPOINT [ "helm-controller" ]

org/flux2/image-automation-controller/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="flux2-image-automation-controller"
+LABEL org.opencontainers.image.description="This controller automates updates to YAML when new container images are available."
+LABEL org.opencontainers.image.source="https://github.com/fluxcd/image-automation-controller"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+RUN echo "rpm http://git.altlinux.org repo/353490/x86_64 task" > /etc/apt/sources.list
+
+{{ install_packages("flux2-image-automation-controller") }}
+
+USER 65534:65534
+
+ENTRYPOINT [ "image-automation-controller" ]

org/flux2/image-reflector-controller/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="flux2-image-reflector-controller"
+LABEL org.opencontainers.image.description="This is a controller that reflects container image metadata into a Kubernetes cluster"
+LABEL org.opencontainers.image.source="https://github.com/fluxcd/image-reflector-controller"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+RUN echo "rpm http://git.altlinux.org repo/353490/x86_64 task" > /etc/apt/sources.list
+
+{{ install_packages("flux2-image-reflector-controller") }}
+
+USER 65534:65534
+
+ENTRYPOINT [ "image-reflector-controller" ]

org/flux2/kustomize-controller/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="flux2-kustomize-controller"
+LABEL org.opencontainers.image.description="Kubernetes operator, allowing one to declaratively manage Helm chart releases."
+LABEL org.opencontainers.image.source="https://github.com/fluxcd/kustomize-controller"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+RUN echo "rpm http://git.altlinux.org repo/353490/x86_64 task" > /etc/apt/sources.list
+
+{{ install_packages("flux2-kustomize-controller") }}
+
+USER 65534:65534
+
+ENTRYPOINT [ "kustomize-controller" ]

org/flux2/notification-controller/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="flux2-notification-controller"
+LABEL org.opencontainers.image.description="Event forwarder and notification dispatcher for the GitOps Toolkit controllers"
+LABEL org.opencontainers.image.source="https://github.com/fluxcd/notification-controller"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+RUN echo "rpm http://git.altlinux.org repo/353490/x86_64 task" > /etc/apt/sources.list
+
+{{ install_packages("flux2-notification-controller") }}
+
+USER 65534:65534
+
+ENTRYPOINT [ "notification-controller" ]

org/flux2/source-controller/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="flux2-source-controller"
+LABEL org.opencontainers.image.description="Kubernetes operator, specialised in artifacts acquisition from external sources such as Git, OCI, Helm repositories and S3-compatible buckets."
+LABEL org.opencontainers.image.source="https://github.com/fluxcd/source-controller"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+RUN echo "rpm http://git.altlinux.org repo/353490/x86_64 task" > /etc/apt/sources.list
+
+{{ install_packages("flux2-source-controller") }}
+
+USER 65534:65534
+
+ENTRYPOINT [ "source-controller" ]

org/k8s/cert-manager-acmesolver/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="cert-manager-acmesolver"
+LABEL org.opencontainers.image.description="HTTP server used to solve ACME challenges."
+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") }}
+
+RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
+
+USER 1000
+
+ENTRYPOINT ["/usr/bin/acmesolver"]

org/k8s/cert-manager-acmesolver/test

@@ -0,0 +1 @@
+acmesolver --help

org/k8s/cert-manager-cainjector/Dockerfile.template

@@ -3,12 +3,12 @@ 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.description="cert-manager CA injector is a Kubernetes addon to automate the injection of CA data into webhooks and APIServices from cert-manager certificates."
 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_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
 

org/k8s/cert-manager-controller/Dockerfile.template

@@ -3,12 +3,12 @@ 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.description="Automatically provision and manage 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_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
 

org/k8s/cert-manager-startupapicheck/Dockerfile.template

@@ -0,0 +1,17 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="cert-manager-startupapicheck"
+LABEL org.opencontainers.image.description="Check that cert-manager started successfully."
+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") }}
+
+RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
+
+USER 1000
+
+ENTRYPOINT ["/usr/bin/startupapicheck"]

org/k8s/cert-manager-startupapicheck/test

@@ -0,0 +1 @@
+startupapicheck --help

org/k8s/cert-manager-webhook/Dockerfile.template

@@ -3,12 +3,12 @@ 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.description="The webhook component provides API validation, mutation and conversion functionality for cert-manager."
 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_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}
 
 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger
 

org/k8s/coredns/Dockerfile.template

@@ -8,6 +8,6 @@ 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_pakages("coredns") }}
+{{ install_packages("coredns") }}
 
 ENTRYPOINT ["/usr/bin/coredns"]

org/k8s/etcd/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages("etcd") }}
+{{ install_packages("etcd") }}
 
 VOLUME /data
 

org/k8s/flannel-cni-plugin/Dockerfile.template

@@ -8,6 +8,6 @@ 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_pakages("cni-plugin-flannel") }}
+{{ install_packages("cni-plugin-flannel") }}
 
 RUN cp /usr/libexec/cni/flannel /flannel

org/k8s/flannel/Dockerfile.template

@@ -8,7 +8,7 @@ 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_pakages(
+{{ install_packages(
     "iproute2",
     "net-tools",
     "ca-certificates",

org/k8s/kube-apiserver/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-{{ install_pakages("kubernetes-master") }}
+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") }}
 
 ENTRYPOINT ["/usr/bin/kube-apiserver"]

org/k8s/kube-controller-manager/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-{{ install_pakages("kubernetes-master") }}
+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") }}
 
 ENTRYPOINT ["/usr/bin/kube-controller-manager"]

org/k8s/kube-proxy/Dockerfile.template

@@ -2,7 +2,13 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-{{ install_pakages("kubernetes-node") }}
+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") }}
 
 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy
 

org/k8s/kube-scheduler/Dockerfile.template

@@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
-{{ install_pakages("kubernetes-master") }}
+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") }}
 
 ENTRYPOINT ["/usr/bin/kube-scheduler"]

org/k8s/pause/Dockerfile.template

@@ -1,6 +1,6 @@
 FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer
 
-{{ install_pakages("kubernetes-pause") }}
+{{ install_packages("kubernetes-pause") }}
 
 FROM scratch
 

org/k8s/trivy-node-collector/Dockerfile.template

@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/aquasecurity/k8s-node-
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{{ install_pakages(
+{{ install_packages(
     "k8s-trivy-node-collector"
 ) }}
 

tags.toml

@@ -1,51 +1,77 @@
 ["k8s/kube-apiserver"]
-p10 = [ "v1.26.9" ]
-sisyphus = [ "v1.26.9" ]
+p10 = [ "v1.28.9" ]
+sisyphus = [ "v1.28.9" ]
+c10f1 = [ "v1.26.15" ]
+c10f2 = [ "v1.26.15" ]
 
 ["k8s/kube-controller-manager"]
-p10 = [ "v1.26.9" ]
-sisyphus = [ "v1.26.9" ]
+p10 = [ "v1.28.9" ]
+sisyphus = [ "v1.28.9" ]
+c10f1 = [ "v1.26.15" ]
+c10f2 = [ "v1.26.15" ]
 
 ["k8s/kube-scheduler"]
-p10 = [ "v1.26.9" ]
-sisyphus = [ "v1.26.9" ]
+p10 = [ "v1.28.9" ]
+sisyphus = [ "v1.28.9" ]
+c10f1 = [ "v1.26.15" ]
+c10f2 = [ "v1.26.15" ]
 
 ["k8s/kube-proxy"]
-p10 = [ "v1.26.9" ]
-sisyphus = [ "v1.26.9" ]
+p10 = [ "v1.28.9" ]
+sisyphus = [ "v1.28.9" ]
+c10f1 = [ "v1.26.15" ]
+c10f2 = [ "v1.26.15" ]
 
 ["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" ]
 
 ["k8s/coredns"]
 p10 = [ "v1.10.1" ]
 sisyphus = [ "v1.10.1" ]
+c10f1 = [ "v1.9.3" ]
+c10f2 = [ "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" ]
 
 ["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" ]