fix test for loki

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

.gitea/workflows/testscript

@@ -24,20 +24,25 @@ do
     then imgpath="$2-$1/$IM:latest"
   fi
 
+  entrypoint='/usr/bin/sh'
+  if [[ $1 == 'p10' ]]
+    then entrypoint='/bin/sh'
+  fi
+
   command="echo empty_command"
   if [[ $test != '' ]]; then
-    command="podman run --rm --entrypoint=\"/bin/sh\" $3/$imgpath -c \"$test\""
+    command="podman run --rm --entrypoint=\"$entrypoint\" $3/$imgpath -c \"$test\""
   else
-    if [[ $IM = 'distroless-true' ]]; then
+    if [[ $IM == 'distroless-true' ]]; then
       command="podman run --rm $3/$imgpath \"true\""
     fi
-    if [[ $IM = 'distroless-gotop' ]]; then 
+    if [[ $IM == 'distroless-gotop' ]]; then 
       command="podman run --rm $3/$imgpath \"--version\""
     fi 
-    if [[ $IM = 'flannel-cni-plugin' ]]; then
+    if [[ $IM == 'flannel-cni-plugin' ]]; then
       command="podman run --rm $3/$imgpath \"/flannel\""
     fi
-    if [[ $IM = 'pause' ]]; then 
+    if [[ $IM == 'pause' ]]; then 
       command="podman run --rm $3/$imgpath \"/pause\" \"-v\""
     fi 
   fi

.gitea/workflows/wf_full_p10.yaml

@@ -25,6 +25,13 @@ jobs:
         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
@@ -55,7 +62,6 @@ jobs:
         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

.gitea/workflows/wf_full_p11.yaml

@@ -0,0 +1,133 @@
+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: Set repo for p11 (Temporary)
+        if: ${{ contains(github.ref_name, 'p11') }}
+        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-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

.gitea/workflows/wf_single.yaml

@@ -0,0 +1,147 @@
+name: Building alt images
+on:
+  push:
+    tags:
+      - '*_*/*'
+
+jobs:
+  build-process:
+    runs-on: alt-latest
+    outputs:
+      branch: ${{ env.BRANCH }}
+      image: ${{ env.IMAGE }}
+      url: ${{ env.URL }}
+      repo: ${{ env.REPO }}
+      buildres: ${{ steps.build-script.outcome }}
+      test: ${{ env.TEST }}
+    steps:
+      - name: Check workspace
+        run: |
+          repourl=$(echo $GU | cut -d '/' -f 3)
+          echo "URL=$repourl" >> ${GITHUB_ENV}
+          echo "URL=$repourl"
+          reponame=$(echo $GR | cut -d '/' -f 1)
+          echo "REPO=$reponame" >> ${GITHUB_ENV} 
+          echo "REPO=$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: 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: Check files in the repository
+        run: |
+          ls -a ${{ gitea.workspace }}          
+      - 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}
+          localimage=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
+          echo "IMAGE=$localimage" >> ${GITHUB_ENV}                              
+          echo "IMAGE=$localimage"          
+      - name: Get test for image
+        run: |
+          if test -f ${{ gitea.workspace }}/org/$IM/test; then testscript=$(cat ${{ gitea.workspace }}/org/$IM/test); else testscript=""; fi
+          echo "TEST=$testscript" >> ${GITHUB_ENV}          
+        env:                                     
+          IM: ${{ env.IMAGE }}
+          BR: ${{ env.BRANCH }}
+      - name: Run building script
+        id: build-script
+        run: |
+          echo "build.py -i $IM -b $BR"
+          ${{ gitea.workspace }}/build.py -i $IM -b $BR          
+        env:
+          IM: ${{ env.IMAGE }}
+          BR: ${{ env.BRANCH }}
+        continue-on-error: true
+      - name: Send notification if build crashed
+        if: ${{ steps.build-script.outcome != 'success' }}
+        run: |
+          issueid=1
+          body="Building image $IM 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 }}
+          IM: ${{ env.IMAGE }}
+      - 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-latest
+    steps:
+      - name: Update apt
+        uses: https://gitea.basealt.ru/actions/init-alt-env@v1
+      - name: Install requires
+        run: |
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl                 
+      - name: Run test
+        id: test-script
+        if: ${{ needs.build-process.outputs.test != '' }}
+        continue-on-error: true
+        run: |
+          if [[ $BR = 'p10' ]]; then podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; else podman run --rm --entrypoint="/usr/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
+        env:                
+          IM: ${{ needs.build-process.outputs.image }} 
+          BR: ${{ needs.build-process.outputs.branch }}
+          URL: ${{ needs.build-process.outputs.url }}  
+          REPO: ${{ needs.build-process.outputs.repo }}
+          TEST: ${{ needs.build-process.outputs.test }}
+      - name: Run special test
+        id: special-test
+        if: ${{ needs.build-process.outputs.test == '' }}
+        continue-on-error: true
+        run: |
+          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$IM:$BR true; fi
+          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$IM:$BR --version; fi
+        env:
+          IM: ${{ needs.build-process.outputs.image }}
+          BR: ${{ needs.build-process.outputs.branch }}
+          URL: ${{ needs.build-process.outputs.url }}
+          REPO: ${{ needs.build-process.outputs.repo }}
+      - name: Send notification if test crashed
+        if: ${{ steps.test-script.outcome == 'failure' || steps.special-test.outcome == 'failure' }}
+        run: |
+          issueid=1
+          errors=$(cat errors.log)
+          body="Testing image $IM 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: ${{ needs.build-process.outputs.branch }}
+          URL: ${{ gitea.server_url }}
+          REPO: ${{ needs.build-process.outputs.repo }}
+          IM: ${{ needs.build-process.outputs.image }}
+

.gitignore

@@ -0,0 +1 @@
+Dockerfile

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/cert-manager/images.yml

@@ -1,403 +0,0 @@
-version: 1.0
-imageSet:
-
-  - version: v1.26.0
-    cert-manager-cainjector:
-      tag: v1.26.0
-    cert-manager-controller:
-      tag: v1.26.0
-    cert-manager-webhook:
-      tag: v1.26.0
-
-  - version: v1.26.1
-    cert-manager-cainjector:
-      tag: v1.26.1
-    cert-manager-controller:
-      tag: v1.26.1
-    cert-manager-webhook:
-      tag: v1.26.1
-
-  - version: v1.26.2
-    cert-manager-cainjector:
-      tag: v1.26.2
-    cert-manager-controller:
-      tag: v1.26.2
-    cert-manager-webhook:
-      tag: v1.26.2
-
-  - version: v1.26.3
-    cert-manager-cainjector:
-      tag: v1.26.3
-    cert-manager-controller:
-      tag: v1.26.3
-    cert-manager-webhook:
-      tag: v1.26.3
-
-  - version: v1.26.4
-    cert-manager-cainjector:
-      tag: v1.26.4
-    cert-manager-controller:
-      tag: v1.26.4
-    cert-manager-webhook:
-      tag: v1.26.4
-
-  - version: v1.26.5
-    cert-manager-cainjector:
-      tag: v1.26.5
-    cert-manager-controller:
-      tag: v1.26.5
-    cert-manager-webhook:
-      tag: v1.26.5
-
-  - version: v1.26.6
-    cert-manager-cainjector:
-      tag: v1.26.6
-    cert-manager-controller:
-      tag: v1.26.6
-    cert-manager-webhook:
-      tag: v1.26.6
-
-  - version: v1.26.7
-    cert-manager-cainjector:
-      tag: v1.26.7
-    cert-manager-controller:
-      tag: v1.26.7
-    cert-manager-webhook:
-      tag: v1.26.7
-
-  - version: v1.26.8
-    cert-manager-cainjector:
-      tag: v1.26.8
-    cert-manager-controller:
-      tag: v1.26.8
-    cert-manager-webhook:
-      tag: v1.26.8
-
-  - version: v1.26.9
-    cert-manager-cainjector:
-      tag: v1.26.9
-    cert-manager-controller:
-      tag: v1.26.9
-    cert-manager-webhook:
-      tag: v1.26.9
-
-  - version: v1.26.10
-    cert-manager-cainjector:
-      tag: v1.26.10
-    cert-manager-controller:
-      tag: v1.26.10
-    cert-manager-webhook:
-      tag: v1.26.10
-
-  - version: v1.26.11
-    cert-manager-cainjector:
-      tag: v1.26.11
-    cert-manager-controller:
-      tag: v1.26.11
-    cert-manager-webhook:
-      tag: v1.26.11
-
-  - version: v1.26.12
-    cert-manager-cainjector:
-      tag: v1.26.12
-    cert-manager-controller:
-      tag: v1.26.12
-    cert-manager-webhook:
-      tag: v1.26.12
-
-  - version: v1.26.13
-    cert-manager-cainjector:
-      tag: v1.26.13
-    cert-manager-controller:
-      tag: v1.26.13
-    cert-manager-webhook:
-      tag: v1.26.13
-
-  - version: v1.26.14
-    cert-manager-cainjector:
-      tag: v1.26.14
-    cert-manager-controller:
-      tag: v1.26.14
-    cert-manager-webhook:
-      tag: v1.26.14
-
-  - version: v1.26.15
-    cert-manager-cainjector:
-      tag: v1.26.15
-    cert-manager-controller:
-      tag: v1.26.15
-    cert-manager-webhook:
-      tag: v1.26.15
-
-  - version: v1.27.0
-    cert-manager-cainjector:
-      tag: v1.27.0
-    cert-manager-controller:
-      tag: v1.27.0
-    cert-manager-webhook:
-      tag: v1.27.0
-
-  - version: v1.27.1
-    cert-manager-cainjector:
-      tag: v1.27.1
-    cert-manager-controller:
-      tag: v1.27.1
-    cert-manager-webhook:
-      tag: v1.27.1
-
-  - version: v1.27.2
-    cert-manager-cainjector:
-      tag: v1.27.2
-    cert-manager-controller:
-      tag: v1.27.2
-    cert-manager-webhook:
-      tag: v1.27.2
-
-  - version: v1.27.3
-    cert-manager-cainjector:
-      tag: v1.27.3
-    cert-manager-controller:
-      tag: v1.27.3
-    cert-manager-webhook:
-      tag: v1.27.3
-
-  - version: v1.27.4
-    cert-manager-cainjector:
-      tag: v1.27.4
-    cert-manager-controller:
-      tag: v1.27.4
-    cert-manager-webhook:
-      tag: v1.27.4
-
-  - version: v1.27.5
-    cert-manager-cainjector:
-      tag: v1.27.5
-    cert-manager-controller:
-      tag: v1.27.5
-    cert-manager-webhook:
-      tag: v1.27.5
-
-  - version: v1.27.6
-    cert-manager-cainjector:
-      tag: v1.27.6
-    cert-manager-controller:
-      tag: v1.27.6
-    cert-manager-webhook:
-      tag: v1.27.6
-
-  - version: v1.27.7
-    cert-manager-cainjector:
-      tag: v1.27.7
-    cert-manager-controller:
-      tag: v1.27.7
-    cert-manager-webhook:
-      tag: v1.27.7
-
-  - version: v1.27.8
-    cert-manager-cainjector:
-      tag: v1.27.8
-    cert-manager-controller:
-      tag: v1.27.8
-    cert-manager-webhook:
-      tag: v1.27.8
-
-  - version: v1.27.9
-    cert-manager-cainjector:
-      tag: v1.27.9
-    cert-manager-controller:
-      tag: v1.27.9
-    cert-manager-webhook:
-      tag: v1.27.9
-
-  - version: v1.27.10
-    cert-manager-cainjector:
-      tag: v1.27.10
-    cert-manager-controller:
-      tag: v1.27.10
-    cert-manager-webhook:
-      tag: v1.27.10
-
-  - version: v1.27.11
-    cert-manager-cainjector:
-      tag: v1.27.11
-    cert-manager-controller:
-      tag: v1.27.11
-    cert-manager-webhook:
-      tag: v1.27.11
-
-  - version: v1.27.12
-    cert-manager-cainjector:
-      tag: v1.27.12
-    cert-manager-controller:
-      tag: v1.27.12
-    cert-manager-webhook:
-      tag: v1.27.12
-
-  - version: v1.27.13
-    cert-manager-cainjector:
-      tag: v1.27.13
-    cert-manager-controller:
-      tag: v1.27.13
-    cert-manager-webhook:
-      tag: v1.27.13
-
-  - version: v1.27.14
-    cert-manager-cainjector:
-      tag: v1.27.14
-    cert-manager-controller:
-      tag: v1.27.14
-    cert-manager-webhook:
-      tag: v1.27.14
-
-  - version: v1.28.0
-    cert-manager-cainjector:
-      tag: v1.28.0
-    cert-manager-controller:
-      tag: v1.28.0
-    cert-manager-webhook:
-      tag: v1.28.0
-
-  - version: v1.28.1
-    cert-manager-cainjector:
-      tag: v1.28.1
-    cert-manager-controller:
-      tag: v1.28.1
-    cert-manager-webhook:
-      tag: v1.28.1
-
-  - version: v1.28.2
-    cert-manager-cainjector:
-      tag: v1.28.2
-    cert-manager-controller:
-      tag: v1.28.2
-    cert-manager-webhook:
-      tag: v1.28.2
-
-  - version: v1.28.3
-    cert-manager-cainjector:
-      tag: v1.28.3
-    cert-manager-controller:
-      tag: v1.28.3
-    cert-manager-webhook:
-      tag: v1.28.3
-
-  - version: v1.28.4
-    cert-manager-cainjector:
-      tag: v1.28.4
-    cert-manager-controller:
-      tag: v1.28.4
-    cert-manager-webhook:
-      tag: v1.28.4
-
-  - version: v1.28.5
-    cert-manager-cainjector:
-      tag: v1.28.5
-    cert-manager-controller:
-      tag: v1.28.5
-    cert-manager-webhook:
-      tag: v1.28.5
-
-  - version: v1.28.6
-    cert-manager-cainjector:
-      tag: v1.28.6
-    cert-manager-controller:
-      tag: v1.28.6
-    cert-manager-webhook:
-      tag: v1.28.6
-
-  - version: v1.28.7
-    cert-manager-cainjector:
-      tag: v1.28.7
-    cert-manager-controller:
-      tag: v1.28.7
-    cert-manager-webhook:
-      tag: v1.28.7
-
-  - version: v1.28.8
-    cert-manager-cainjector:
-      tag: v1.28.8
-    cert-manager-controller:
-      tag: v1.28.8
-    cert-manager-webhook:
-      tag: v1.28.8
-
-  - version: v1.28.9
-    cert-manager-cainjector:
-      tag: v1.28.9
-    cert-manager-controller:
-      tag: v1.28.9
-    cert-manager-webhook:
-      tag: v1.28.9
-
-  - version: v1.28.10
-    cert-manager-cainjector:
-      tag: v1.28.10
-    cert-manager-controller:
-      tag: v1.28.10
-    cert-manager-webhook:
-      tag: v1.28.10
-
-  - version: v1.29.0
-    cert-manager-cainjector:
-      tag: v1.29.0
-    cert-manager-controller:
-      tag: v1.29.0
-    cert-manager-webhook:
-      tag: v1.29.0
-
-  - version: v1.29.1
-    cert-manager-cainjector:
-      tag: v1.29.1
-    cert-manager-controller:
-      tag: v1.29.1
-    cert-manager-webhook:
-      tag: v1.29.1
-
-  - version: v1.29.2
-    cert-manager-cainjector:
-      tag: v1.29.2
-    cert-manager-controller:
-      tag: v1.29.2
-    cert-manager-webhook:
-      tag: v1.29.2
-
-  - version: v1.29.3
-    cert-manager-cainjector:
-      tag: v1.29.3
-    cert-manager-controller:
-      tag: v1.29.3
-    cert-manager-webhook:
-      tag: v1.29.3
-
-  - version: v1.29.4
-    cert-manager-cainjector:
-      tag: v1.29.4
-    cert-manager-controller:
-      tag: v1.29.4
-    cert-manager-webhook:
-      tag: v1.29.4
-
-  - version: v1.29.5
-    cert-manager-cainjector:
-      tag: v1.29.5
-    cert-manager-controller:
-      tag: v1.29.5
-    cert-manager-webhook:
-      tag: v1.29.5
-
-  - version: v1.30.0
-    cert-manager-cainjector:
-      tag: v1.30.0
-    cert-manager-controller:
-      tag: v1.30.0
-    cert-manager-webhook:
-      tag: v1.30.0
-
-  - version: v1.30.1
-    cert-manager-cainjector:
-      tag: v1.30.1
-    cert-manager-controller:
-      tag: v1.30.1
-    cert-manager-webhook:
-      tag: v1.30.1
-

branch/sisyphus/flannel/flannel-cni-plugin/Dockerfile

@@ -1,13 +0,0 @@
-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_pakages("cni-plugin-flannel") }}
-
-RUN cp /usr/libexec/cni/flannel /flannel

branch/sisyphus/flannel/flannel/Dockerfile

@@ -1,28 +0,0 @@
-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_pakages(
-    "iproute2",
-    "net-tools",
-    "ca-certificates",
-    "iptables",
-    "iptables-nft",
-    "strongswan",
-    "wireguard-tools",
-    "flannel",
-    "wget",
-) }}
-
-RUN update-ca-trust
-
-RUN mkdir -p /opt/bin/ && cp /usr/sbin/flanneld /opt/bin/flanneld
-RUN cp /usr/libexec/flannel/mk-docker-opts.sh /opt/bin/
-
-ENTRYPOINT ["/opt/bin/flanneld"]

branch/sisyphus/flannel/images.yml

@@ -1,147 +0,0 @@
-version: 1.0
-imageSet:
-
-  - version: v0.19.0
-    flannel:
-      tag: v0.19.0
-    'flannel-cni-plugin':
-      tag: v1.1.0
-
-  - version: v0.19.1
-    flannel:
-      tag: v0.19.1
-    'flannel-cni-plugin':
-      tag: v1.1.0
-
-  - version: v0.19.2
-    flannel:
-      tag: v0.19.2
-    'flannel-cni-plugin':
-      tag: v1.1.0
-
-  - version: v0.20.0
-    flannel:
-      tag: v0.20.0
-    'flannel-cni-plugin':
-      tag: v1.1.0
-
-  - version: v0.20.1
-    flannel:
-      tag: v0.20.1
-    'flannel-cni-plugin':
-      tag: v1.1.0
-
-  - version: v0.20.2
-    flannel:
-      tag: v0.20.2
-    'flannel-cni-plugin':
-      tag: v1.1.0
-
-  - version: v0.21.0
-    flannel:
-      tag: v0.21.0
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.21.1
-    flannel:
-      tag: v0.21.1
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.21.2
-    flannel:
-      tag: v0.21.2
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.21.3
-    flannel:
-      tag: v0.21.3
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.21.4
-    flannel:
-      tag: v0.21.4
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.21.5
-    flannel:
-      tag: v0.21.5
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.22.0
-    flannel:
-      tag: v0.22.0
-    'flannel-cni-plugin':
-      tag: v1.1.2
-
-  - version: v0.22.1
-    flannel:
-      tag: v0.22.1
-    'flannel-cni-plugin':
-      tag: v1.2.0
-
-  - version: v0.22.2
-    flannel:
-      tag: v0.22.2
-    'flannel-cni-plugin':
-      tag: v1.2.0
-
-  - version: v0.22.3
-    flannel:
-      tag: v0.22.3
-    'flannel-cni-plugin':
-      tag: v1.2.0
-
-  - version: v0.23.0
-    flannel:
-      tag: v0.23.0
-    'flannel-cni-plugin':
-      tag: v1.2.0
-
-  - version: v0.24.0
-    flannel:
-      tag: v0.24.0
-    'flannel-cni-plugin':
-      tag: v1.2.0
-
-  - version: v0.24.1
-    flannel:
-      tag: v0.24.1
-    'flannel-cni-plugin':
-      tag: v1.2.0
-
-  - version: v0.24.2
-    flannel:
-      tag: v0.24.2
-    'flannel-cni-plugin':
-      tag: v1.4.0-flannel1
-
-  - version: v0.24.3
-    flannel:
-      tag: v0.24.3
-    'flannel-cni-plugin':
-      tag: v1.4.0-flannel1
-
-  - version: v0.24.4
-    flannel:
-      tag: v0.24.4
-    'flannel-cni-plugin':
-      tag: v1.4.0-flannel1
-
-  - version: v0.25.0
-    flannel:
-      tag: v0.25.0
-    'flannel-cni-plugin':
-      tag: v1.4.0-flannel1
-
-  - version: v0.25.1
-    flannel:
-      tag: v0.25.1
-    'flannel-cni-plugin':
-      tag: v1.4.0-flannel1
-

branch/sisyphus/k8s/coredns

@@ -1 +0,0 @@
-../target/coredns/

branch/sisyphus/k8s/etcd

@@ -1 +0,0 @@
-../target/etcd/

branch/sisyphus/k8s/images.yml

@@ -1,803 +0,0 @@
-version: 1.0
-imageSet:
-
-  - version: v1.26.0
-    kube-apiserver:
-      tag: v1.26.0
-    kube-controllermanager:
-      tag: v1.26.0
-    kube-proxy:
-      tag: v1.26.0
-    kube-scheduler:
-      tag: v1.26.0
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.1
-    kube-apiserver:
-      tag: v1.26.1
-    kube-controllermanager:
-      tag: v1.26.1
-    kube-proxy:
-      tag: v1.26.1
-    kube-scheduler:
-      tag: v1.26.1
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.2
-    kube-apiserver:
-      tag: v1.26.2
-    kube-controllermanager:
-      tag: v1.26.2
-    kube-proxy:
-      tag: v1.26.2
-    kube-scheduler:
-      tag: v1.26.2
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.3
-    kube-apiserver:
-      tag: v1.26.3
-    kube-controllermanager:
-      tag: v1.26.3
-    kube-proxy:
-      tag: v1.26.3
-    kube-scheduler:
-      tag: v1.26.3
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.4
-    kube-apiserver:
-      tag: v1.26.4
-    kube-controllermanager:
-      tag: v1.26.4
-    kube-proxy:
-      tag: v1.26.4
-    kube-scheduler:
-      tag: v1.26.4
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.5
-    kube-apiserver:
-      tag: v1.26.5
-    kube-controllermanager:
-      tag: v1.26.5
-    kube-proxy:
-      tag: v1.26.5
-    kube-scheduler:
-      tag: v1.26.5
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.6
-    kube-apiserver:
-      tag: v1.26.6
-    kube-controllermanager:
-      tag: v1.26.6
-    kube-proxy:
-      tag: v1.26.6
-    kube-scheduler:
-      tag: v1.26.6
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.7
-    kube-apiserver:
-      tag: v1.26.7
-    kube-controllermanager:
-      tag: v1.26.7
-    kube-proxy:
-      tag: v1.26.7
-    kube-scheduler:
-      tag: v1.26.7
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.8
-    kube-apiserver:
-      tag: v1.26.8
-    kube-controllermanager:
-      tag: v1.26.8
-    kube-proxy:
-      tag: v1.26.8
-    kube-scheduler:
-      tag: v1.26.8
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.9
-    kube-apiserver:
-      tag: v1.26.9
-    kube-controllermanager:
-      tag: v1.26.9
-    kube-proxy:
-      tag: v1.26.9
-    kube-scheduler:
-      tag: v1.26.9
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.6-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.10
-    kube-apiserver:
-      tag: v1.26.10
-    kube-controllermanager:
-      tag: v1.26.10
-    kube-proxy:
-      tag: v1.26.10
-    kube-scheduler:
-      tag: v1.26.10
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.11
-    kube-apiserver:
-      tag: v1.26.11
-    kube-controllermanager:
-      tag: v1.26.11
-    kube-proxy:
-      tag: v1.26.11
-    kube-scheduler:
-      tag: v1.26.11
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.12
-    kube-apiserver:
-      tag: v1.26.12
-    kube-controllermanager:
-      tag: v1.26.12
-    kube-proxy:
-      tag: v1.26.12
-    kube-scheduler:
-      tag: v1.26.12
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.13
-    kube-apiserver:
-      tag: v1.26.13
-    kube-controllermanager:
-      tag: v1.26.13
-    kube-proxy:
-      tag: v1.26.13
-    kube-scheduler:
-      tag: v1.26.13
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.14
-    kube-apiserver:
-      tag: v1.26.14
-    kube-controllermanager:
-      tag: v1.26.14
-    kube-proxy:
-      tag: v1.26.14
-    kube-scheduler:
-      tag: v1.26.14
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.26.15
-    kube-apiserver:
-      tag: v1.26.15
-    kube-controllermanager:
-      tag: v1.26.15
-    kube-proxy:
-      tag: v1.26.15
-    kube-scheduler:
-      tag: v1.26.15
-    coredns:
-      tag: v1.9.3
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.0
-    kube-apiserver:
-      tag: v1.27.0
-    kube-controllermanager:
-      tag: v1.27.0
-    kube-proxy:
-      tag: v1.27.0
-    kube-scheduler:
-      tag: v1.27.0
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.1
-    kube-apiserver:
-      tag: v1.27.1
-    kube-controllermanager:
-      tag: v1.27.1
-    kube-proxy:
-      tag: v1.27.1
-    kube-scheduler:
-      tag: v1.27.1
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.2
-    kube-apiserver:
-      tag: v1.27.2
-    kube-controllermanager:
-      tag: v1.27.2
-    kube-proxy:
-      tag: v1.27.2
-    kube-scheduler:
-      tag: v1.27.2
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.3
-    kube-apiserver:
-      tag: v1.27.3
-    kube-controllermanager:
-      tag: v1.27.3
-    kube-proxy:
-      tag: v1.27.3
-    kube-scheduler:
-      tag: v1.27.3
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.4
-    kube-apiserver:
-      tag: v1.27.4
-    kube-controllermanager:
-      tag: v1.27.4
-    kube-proxy:
-      tag: v1.27.4
-    kube-scheduler:
-      tag: v1.27.4
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.5
-    kube-apiserver:
-      tag: v1.27.5
-    kube-controllermanager:
-      tag: v1.27.5
-    kube-proxy:
-      tag: v1.27.5
-    kube-scheduler:
-      tag: v1.27.5
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.6
-    kube-apiserver:
-      tag: v1.27.6
-    kube-controllermanager:
-      tag: v1.27.6
-    kube-proxy:
-      tag: v1.27.6
-    kube-scheduler:
-      tag: v1.27.6
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.7-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.7
-    kube-apiserver:
-      tag: v1.27.7
-    kube-controllermanager:
-      tag: v1.27.7
-    kube-proxy:
-      tag: v1.27.7
-    kube-scheduler:
-      tag: v1.27.7
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.8
-    kube-apiserver:
-      tag: v1.27.8
-    kube-controllermanager:
-      tag: v1.27.8
-    kube-proxy:
-      tag: v1.27.8
-    kube-scheduler:
-      tag: v1.27.8
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.9
-    kube-apiserver:
-      tag: v1.27.9
-    kube-controllermanager:
-      tag: v1.27.9
-    kube-proxy:
-      tag: v1.27.9
-    kube-scheduler:
-      tag: v1.27.9
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.10
-    kube-apiserver:
-      tag: v1.27.10
-    kube-controllermanager:
-      tag: v1.27.10
-    kube-proxy:
-      tag: v1.27.10
-    kube-scheduler:
-      tag: v1.27.10
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.11
-    kube-apiserver:
-      tag: v1.27.11
-    kube-controllermanager:
-      tag: v1.27.11
-    kube-proxy:
-      tag: v1.27.11
-    kube-scheduler:
-      tag: v1.27.11
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.12
-    kube-apiserver:
-      tag: v1.27.12
-    kube-controllermanager:
-      tag: v1.27.12
-    kube-proxy:
-      tag: v1.27.12
-    kube-scheduler:
-      tag: v1.27.12
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.13
-    kube-apiserver:
-      tag: v1.27.13
-    kube-controllermanager:
-      tag: v1.27.13
-    kube-proxy:
-      tag: v1.27.13
-    kube-scheduler:
-      tag: v1.27.13
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.27.14
-    kube-apiserver:
-      tag: v1.27.14
-    kube-controllermanager:
-      tag: v1.27.14
-    kube-proxy:
-      tag: v1.27.14
-    kube-scheduler:
-      tag: v1.27.14
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.0
-    kube-apiserver:
-      tag: v1.28.0
-    kube-controllermanager:
-      tag: v1.28.0
-    kube-proxy:
-      tag: v1.28.0
-    kube-scheduler:
-      tag: v1.28.0
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.1
-    kube-apiserver:
-      tag: v1.28.1
-    kube-controllermanager:
-      tag: v1.28.1
-    kube-proxy:
-      tag: v1.28.1
-    kube-scheduler:
-      tag: v1.28.1
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.2
-    kube-apiserver:
-      tag: v1.28.2
-    kube-controllermanager:
-      tag: v1.28.2
-    kube-proxy:
-      tag: v1.28.2
-    kube-scheduler:
-      tag: v1.28.2
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.3
-    kube-apiserver:
-      tag: v1.28.3
-    kube-controllermanager:
-      tag: v1.28.3
-    kube-proxy:
-      tag: v1.28.3
-    kube-scheduler:
-      tag: v1.28.3
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.4
-    kube-apiserver:
-      tag: v1.28.4
-    kube-controllermanager:
-      tag: v1.28.4
-    kube-proxy:
-      tag: v1.28.4
-    kube-scheduler:
-      tag: v1.28.4
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.5
-    kube-apiserver:
-      tag: v1.28.5
-    kube-controllermanager:
-      tag: v1.28.5
-    kube-proxy:
-      tag: v1.28.5
-    kube-scheduler:
-      tag: v1.28.5
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.9-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.6
-    kube-apiserver:
-      tag: v1.28.6
-    kube-controllermanager:
-      tag: v1.28.6
-    kube-proxy:
-      tag: v1.28.6
-    kube-scheduler:
-      tag: v1.28.6
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.7
-    kube-apiserver:
-      tag: v1.28.7
-    kube-controllermanager:
-      tag: v1.28.7
-    kube-proxy:
-      tag: v1.28.7
-    kube-scheduler:
-      tag: v1.28.7
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.8
-    kube-apiserver:
-      tag: v1.28.8
-    kube-controllermanager:
-      tag: v1.28.8
-    kube-proxy:
-      tag: v1.28.8
-    kube-scheduler:
-      tag: v1.28.8
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.9
-    kube-apiserver:
-      tag: v1.28.9
-    kube-controllermanager:
-      tag: v1.28.9
-    kube-proxy:
-      tag: v1.28.9
-    kube-scheduler:
-      tag: v1.28.9
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.28.10
-    kube-apiserver:
-      tag: v1.28.10
-    kube-controllermanager:
-      tag: v1.28.10
-    kube-proxy:
-      tag: v1.28.10
-    kube-scheduler:
-      tag: v1.28.10
-    coredns:
-      tag: v1.10.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.29.0
-    kube-apiserver:
-      tag: v1.29.0
-    kube-controllermanager:
-      tag: v1.29.0
-    kube-proxy:
-      tag: v1.29.0
-    kube-scheduler:
-      tag: v1.29.0
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.29.1
-    kube-apiserver:
-      tag: v1.29.1
-    kube-controllermanager:
-      tag: v1.29.1
-    kube-proxy:
-      tag: v1.29.1
-    kube-scheduler:
-      tag: v1.29.1
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.29.2
-    kube-apiserver:
-      tag: v1.29.2
-    kube-controllermanager:
-      tag: v1.29.2
-    kube-proxy:
-      tag: v1.29.2
-    kube-scheduler:
-      tag: v1.29.2
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.10-0
-    pause:
-      tag: 3.9
-
-  - version: v1.29.3
-    kube-apiserver:
-      tag: v1.29.3
-    kube-controllermanager:
-      tag: v1.29.3
-    kube-proxy:
-      tag: v1.29.3
-    kube-scheduler:
-      tag: v1.29.3
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.29.4
-    kube-apiserver:
-      tag: v1.29.4
-    kube-controllermanager:
-      tag: v1.29.4
-    kube-proxy:
-      tag: v1.29.4
-    kube-scheduler:
-      tag: v1.29.4
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.29.5
-    kube-apiserver:
-      tag: v1.29.5
-    kube-controllermanager:
-      tag: v1.29.5
-    kube-proxy:
-      tag: v1.29.5
-    kube-scheduler:
-      tag: v1.29.5
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.30.0
-    kube-apiserver:
-      tag: v1.30.0
-    kube-controllermanager:
-      tag: v1.30.0
-    kube-proxy:
-      tag: v1.30.0
-    kube-scheduler:
-      tag: v1.30.0
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-
-  - version: v1.30.1
-    kube-apiserver:
-      tag: v1.30.1
-    kube-controllermanager:
-      tag: v1.30.1
-    kube-proxy:
-      tag: v1.30.1
-    kube-scheduler:
-      tag: v1.30.1
-    coredns:
-      tag: v1.11.1
-    etcd:
-      tag: 3.5.12-0
-    pause:
-      tag: 3.9
-

branch/sisyphus/k8s/kube-apiserver/Dockerfile

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

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/Dockerfile

@@ -1,9 +0,0 @@
-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
-
-RUN alt_install_pakages kubernetes-master
-
-ENTRYPOINT ["/usr/bin/kube-controller-manager"]

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/Dockerfile

@@ -1,11 +0,0 @@
-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
-
-RUN alt_install_pakages kubernetes-node
-
-RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy
-
-ENTRYPOINT ["/usr/bin/kube-proxy"]

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/Dockerfile

@@ -1,9 +0,0 @@
-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
-
-RUN alt_install_pakages kubernetes-master
-
-ENTRYPOINT ["/usr/bin/kube-scheduler"]

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/Dockerfile

@@ -1,13 +0,0 @@
-ARG BRANCH REGISTRY=gitea.basealt.ru ALT_IMAGE=base/alt:$BRANCH MAINTAINER=alt-cloud ALT_TESTSCRIPT=/bin/true
-
-FROM $REGISTRY/$ALT_IMAGE:$BRANCH as installer
-
-RUN alt_install_pakages kubernetes-pause
-
-FROM scratch
-
-MAINTAINER $MAINTAINER
-
-COPY --from=installer /usr/bin/kubernetes-pause /pause
-
-CMD ["/pause"]

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

branch/sisyphus/target/apache/Dockerfile

@@ -1,17 +0,0 @@
-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.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"
-
-RUN alt_install_pakages apache2
-
-EXPOSE 80
-
-CMD ["/usr/sbin/httpd2", "-D", "NO_DETACH", "-k", "start"]

branch/sisyphus/target/coredns/Dockerfile

@@ -1,16 +0,0 @@
-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.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"
-LABEL  org.altlinux.testscript=$ALT_TESTSCRIPT
-
-RUN alt_install_pakages coredns
-
-ENTRYPOINT ["/usr/bin/coredns"]

branch/sisyphus/target/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/target/trivy-node-collector/Dockerfile

@@ -1,17 +0,0 @@
-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_pakages(
-    "k8s-trivy-node-collector"
-) }}
-
-RUN ln -s /usr/bin/k8s-trivy-node-collector /usr/bin/node-collector
-
-ENTRYPOINT ["node-collector"]

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", "c10f1", "c10f2"]
+    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()
 

images-info.toml

@@ -1,65 +1,5 @@
 ["alt/buildpack-deps"]
 skip-branches = [ "p9" ]
 
-["alt/distroless-base"]
-skip-branches = [ "p9" ]
-
-["alt/distroless-builder"]
-skip-branches = [ "p9" ]
-
-["alt/distroless-devel"]
-skip-branches = [ "p9" ]
-
-["alt/distroless-gotop"]
-skip-branches = [ "p9" ]
-
-["alt/distroless-static"]
-skip-branches = [ "p9" ]
-
-["alt/distroless-true"]
-skip-branches = [ "p9" ]
-
-["alt/gitea"]
-skip-branches = [ "p9" ]
-
-["alt/node"]
-skip-branches = [ "p9" ]
-
-["alt/unit"]
-skip-branches = [ "p9" ]
-
-["alt/prometheus"]
-skip-branches = [ "p9" ]
-
-["alt/registry"]
-skip-branches = [ "p9" ]
-
-["k8s/cert-manager-cainjector"]
-skip-branches = [ "p9" ]
-
-["k8s/cert-manager-controller"]
-skip-branches = [ "p9" ]
-
-["k8s/cert-manager-webhook"]
-skip-branches = [ "p9" ]
-
-["k8s/coredns"]
-skip-branches = [ "p9" ]
-
-["k8s/etcd"]
-skip-branches = [ "p9" ]
-
-["k8s/kube-apiserver"]
-skip-branches = [ "p9" ]
-
-["k8s/kube-controller-manager"]
-skip-branches = [ "p9" ]
-
-["k8s/kube-proxy"]
-skip-branches = [ "p9" ]
-
-["k8s/kube-scheduler"]
-skip-branches = [ "p9" ]
-
-["k8s/pause"]
-skip-branches = [ "p9" ]
+["alt/openjdk21"]
+skip-arches = [ "386" ]

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-base/distroless.toml

@@ -4,8 +4,8 @@ builder-install-packages = [
     '{{if_branches(["p10"], "glibc-nss")}}',
     "glibc-timezones",
     "libselinux",
-    '{{if_branches(["p9", "p10"], "libssl1.1")}}',
-    '{{if_branches(["sisyphus"], "libssl1.1")}}',
+    '{{if_branches(["p10"], "libssl1.1")}}',
+    '{{if_branches(["p11"], "libssl3")}}',
     '{{if_branches(["sisyphus"], "libssl3")}}',
     "tzdata",
     "zlib",

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/golang/test

@@ -0,0 +1 @@
+go version

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/grafana/test

@@ -0,0 +1 @@
+grafana --version

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/loki/test

@@ -0,0 +1 @@
+loki -version -config.file=/etc/loki/loki.yaml

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/openjdk21/Dockerfile.template

@@ -0,0 +1,14 @@
+FROM {{ registry }}{{ organization }}/base:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="openjdk21"
+LABEL org.opencontainers.image.description="OpenJDK 21 Runtime Environment"
+LABEL org.opencontainers.image.source="https://openjdk-sources.osci.io"
+LABEL org.opencontainers.image.licenses="Apache-1.1 and Apache-2.0 and BSD and BSD with advertising and GPL-2.0 and GPL-2.0 with exceptions and IJG and LGPL-2.0+ and MIT and MPL-2.0 and ALT-Public-Domain and W3C and Zlib and ISC and FTL and RSA-MD"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages(
+    "java-21-openjdk",
+    "java-21-openjdk-devel"
+) }}

org/alt/openjdk21/test

@@ -0,0 +1 @@
+javac --version && java --version