fix(.gitea/workflows/): Change run-event for workflows from push-tag to dispatch with input parameters

.gitea/workflows/wf_full.yaml

@@ -1,16 +1,30 @@
 name: Full building alt images
 on:
-  push:
+  workflow_dispatch:
-    tags:
+    inputs:
-      - '*_*'
+      branch:
-      - '!*_k8s'
+        description: 'Branch'
+        required: true
+        default: 'sisyphus'
+        type: choice
+        options:
+        - sisyphus
+        - p10
+        - p11
+        - c10f2
+      group:
+        description: 'Images group'
+        required: true
+        type: choice
+        options:
+        - base
+        - alt
+        - kubevirt
 
 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 }}
@@ -27,22 +41,15 @@ jobs:
         run: |
           repourl=$(echo $GU | cut -d '/' -f 3)
           echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
+          echo "URL=$repourl"
           reponame=$(echo $GR | cut -d '/' -f 1)
           echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
+          echo "REPO=$reponame"
+          echo "GROUP=${{ inputs.group }}"
+          echo "BRANCH=${{ inputs.branch }}"
         env:
           GU: ${{ gitea.server_url }}
           GR: ${{ gitea.repository }}
-      - 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: Check out current repo
         uses: actions/checkout@v4
       - name: Change vendor label for c10f
@@ -55,7 +62,7 @@ jobs:
           echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/info.yaml ||:"
           sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/info.yaml ||:
         env:
-          ORG: ${{ env.ORG }}
+          ORG: ${{ inputs.group }}
       - name: Set repo for c10f2 (Temporary)
         if: ${{ contains(github.ref_name, 'c10f2') }}
         run: |
@@ -80,8 +87,8 @@ jobs:
           echo "${{ gitea.workspace }}/build.py $build_args $arches"
           ${{ gitea.workspace }}/build.py $build_args $arches
         env:
-          ORG: ${{ env.ORG }}
+          ORG: ${{ inputs.group }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
           BUILD_URL: "gitea.basealt.ru/alt"
         continue-on-error: true
       - name: Send notification if build crashed
@@ -93,20 +100,9 @@ jobs:
           echo "notification about test error is sent to issue $issueid"
         env:
           T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.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' && needs.build-process.outputs.org != 'k8s' }}
@@ -128,8 +124,8 @@ jobs:
           cat haserr.log >> ${GITHUB_ENV}
           echo "test process finished"
         env:
-          BR: ${{ needs.build-process.outputs.branch }}
+          BR: ${{ inputs.branch }}
-          ORG: ${{ needs.build-process.outputs.org }}
+          ORG: ${{ inputs.group }}
           URL: ${{ needs.build-process.outputs.url }}
           REPO: ${{ needs.build-process.outputs.repo }}
           WS: ${{ gitea.workspace }}
@@ -143,6 +139,6 @@ jobs:
           echo "notification about test error is sent to issue $issueid"
         env:
           T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
+          BR: ${{ inputs.branch }}
           URL: ${{ gitea.server_url }}
           REPO: ${{ needs.build-process.outputs.repo }}

.gitea/workflows/wf_k8s.yaml

@@ -1,27 +1,37 @@
 name: Full building alt images
 on:
-  push:
+  workflow_dispatch:
-    tags:
+    inputs:
-      - "*_k8s"
+      branch:
+        description: 'Branch'
+        required: true
+        default: 'sisyphus'
+        type: choice
+        options:
+        - sisyphus
+        - p10
+        - p11
+        - c10f2
+env:
+  ORG: k8s
 
 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
+      - name: Check workspace and inputs
         run: |
           repourl=$(echo $GU | cut -d '/' -f 3)
           echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
+          echo "URL=$repourl"
           reponame=$(echo $GR | cut -d '/' -f 1)
           echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
+          echo "REPO=$reponame"
+          echo "BRANCH=${{ inputs.branch }}"
         env:
           GU: ${{ gitea.server_url }}
           GR: ${{ gitea.repository }}
@@ -40,15 +50,6 @@ jobs:
           apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
           echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
           apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
-      - 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: Check out current repo
         uses: actions/checkout@v4
       - name: Change vendor label for c10f
@@ -78,7 +79,7 @@ jobs:
           ${{ gitea.workspace }}/.gitea/workflows/k8s_buildscript.py --branch "$BR" --other-build-args "$build_args" --workspace "${{ gitea.workspace }}"
         env:
           ORG: ${{ env.ORG }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
           BUILD_URL: "gitea.basealt.ru/alt"
         continue-on-error: true
       - name: Send notification if build crashed
@@ -90,17 +91,6 @@ jobs:
           echo "notification about test error is sent to issue $issueid"
         env:
           T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.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) }}

.gitea/workflows/wf_single.yaml

@@ -1,21 +1,44 @@
 name: Building alt images
 on:
-  push:
+  workflow_dispatch:
-    tags:
+    inputs:
-      - '*_*/*_*'
+      group:
+        description: 'Image group'
+        required: true
+        type: choice
+        options:
+          k8s
+          kubevirt
+          alt
+          base
+      branch:
+        description: 'Branch'
+        required: true
+        default: 'sisyphus'
+        type: choice
+        options:
+        - sisyphus
+        - p10
+        - p11
+        - c10f2
+      image:
+        description: 'Image name'
+        required: true
+        type: string
+      version:
+        description: 'Needed version'
+        type: string
 
 jobs:
   build-process:
     runs-on: alt-sisyphus
     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
+      - name: Check workspace and inputs
         run: |
           repourl=$(echo $GU | cut -d '/' -f 3)
           echo "URL=$repourl" >> ${GITHUB_ENV}
@@ -23,6 +46,10 @@ jobs:
           reponame=$(echo $GR | cut -d '/' -f 1)
           echo "REPO=$reponame" >> ${GITHUB_ENV} 
           echo "REPO=$reponame"
+          echo "BRANCH=${{ inputs.branch }}"
+          echo "ORG=${{ inputs.group }}"
+          echo "IMAGE=${{ inputs.image }}"
+          echo "VERSION=${{ inputs.version }}"
         env:
           GU: ${{ gitea.server_url }}
           GR: ${{ gitea.repository }}
@@ -50,24 +77,6 @@ jobs:
         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"
-          org=$(echo "$localimage" | cut -d '/' -f 1)
-          echo "ORG=$org" >> ${GITHUB_ENV}
-          echo "ORG=$org"
-          ver=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 3)
-          echo "VER=$ver" >> ${GITHUB_ENV}
-          echo "VER=$ver"
       - name: Change vendor label for c10f
         if: ${{ contains(github.ref_name, 'c10f') }}
         run: |
@@ -78,14 +87,14 @@ jobs:
           echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/info.yaml ||:"
           sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/info.yaml ||:
         env:                                                                                                               
-          ORG: ${{ env.ORG }}
+          ORG: ${{ inputs.group }}
       - 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 }}
+          IM: ${{ inputs.image }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
       - name: Run building script
         id: build-script
         run: |
@@ -94,10 +103,10 @@ jobs:
           echo "build.py -i $IM -b $BR $arches $k8sarg"
           ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches --latest $BR --log-level debug --registry gitea.basealt.ru/alt $k8sarg 
         env:
-          IM: ${{ env.IMAGE }}
+          IM: ${{ inputs.image }}
-          VER: ${{ env.VER }}
+          VER: ${{ inputs.version }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
-          ORG: ${{ env.ORG }}
+          ORG: ${{ inputs.group }}
         continue-on-error: true
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}
@@ -108,21 +117,10 @@ jobs:
           echo "notification about test error is sent to issue $issueid" 
         env:
           T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
           URL: ${{ gitea.server_url }}
           REPO: ${{ env.REPO }}
-          IM: ${{ env.IMAGE }}
+          IM: ${{ inputs.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' }}
@@ -142,8 +140,8 @@ jobs:
           imname=$(echo "$IM" | cut -d "/" -f2)
           if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$REPO/$BR/$imname:latest -c "$TEST"; fi
         env:
-          IM: ${{ needs.build-process.outputs.image }} 
+          IM: ${{ inputs.image }} 
-          BR: ${{ needs.build-process.outputs.branch }}
+          BR: ${{ inputs.branch }}
           URL: ${{ needs.build-process.outputs.url }}  
           REPO: ${{ needs.build-process.outputs.repo }}
           TEST: ${{ needs.build-process.outputs.test }}
@@ -156,8 +154,8 @@ jobs:
           if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest true; fi
           if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest --version; fi
         env:
-          IM: ${{ needs.build-process.outputs.image }}
+          IM: ${{ inputs.image }}
-          BR: ${{ needs.build-process.outputs.branch }}
+          BR: ${{ inputs.branch }}
           URL: ${{ needs.build-process.outputs.url }}
           REPO: ${{ needs.build-process.outputs.repo }}
       - name: Send notification if test crashed
@@ -165,13 +163,13 @@ jobs:
         run: |
           issueid=1
           errors=$(cat errors.log)
-          body="Testing image $IM finish with some errors."
+          body="Testing image $IM 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 }}
+          BR: ${{ inputs.branch }}
           URL: ${{ gitea.server_url }}
           REPO: ${{ needs.build-process.outputs.repo }}
-          IM: ${{ needs.build-process.outputs.image }}
+          IM: ${{ inputs.image }}
 

build.py

@@ -432,22 +432,12 @@ class DockerBuilder:
         else:
             registry = ""
             alt_image = "alt"
-
-        if self.branch == "c10f2":
-            base_image_prefix = "c10f"
-            label_vendor = "BaseALT LLC"
-        else:
-            base_image_prefix = self.branch
-            label_vendor = "ALT Linux Team"
-
         rendered = JINJA_ENV.from_string(template).render(
             alt_image=alt_image,
             branch=self.branch,
-            base_image_prefix=base_image_prefix,
             install_packages=install_packages,
             organization=organization,
             registry=registry,
-            label_vendor=label_vendor,
             pkg_versions=PKG_VERSIONS,
             **kwargs,
         )
@@ -795,7 +785,7 @@ class DockerBuilder:
             ".",
         ]
 
-        if image.annotations is not None and self.branch != "c10f2":
+        if image.annotations is not None:
             build_cmd = [
                 "podman",
                 "build",

org/alt/php/Dockerfile.template

@@ -13,9 +13,14 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"
 	"php8.2",
 	"php8.2-xdebug",
 ) }}
+{% elseif branch == 'c10f2' %}
+{{ install_packages(                  
+        "php8.3",                     
+        "php8.3-xdebug",              
+) }}
 {% else %}
 {{ install_packages(
-	"php8.3",
+	"php8.4",
-	"php8.3-xdebug",
+	"php8.4-xdebug",
 ) }}
 {% endif %}

org/alt/php/info.yaml

@@ -3,10 +3,12 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
   - >
-    {%- if branch in [ "p10", "c10f1", "c10f2"] -%}
+    {%- if branch in ["p10", "c10f1"] -%}
     php8.2
-    {%- else -%}
+    {%- elseif branch in ["c10f2"] -%}
     php8.3
+    {%- else -%}
+    php8.4
     {%- endif -%}
 annotations:
   org.opencontainers.image.revision: ''

org/alt/postgresql/Dockerfile.template

@@ -7,8 +7,12 @@ LABEL org.opencontainers.image.description="PostgreSQL rograms and libraries"
 LABEL org.opencontainers.image.source="https://github.com/postgres/postgres"
 LABEL org.opencontainers.image.licenses="PostgreSQL"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
-                                
+
+{% if branch == 'c10f2' %}
 {{ install_packages("postgresql16","postgresql16-server") }}
+{% else %}
+{{ install_packages("postgresql17","postgresql17-server") }}
+{% endif %}
 
 RUN usermod -a -G postgres postgres
 RUN chown -R postgres:postgres /var/lib/pgsql

org/alt/postgresql/info.yaml

@@ -2,7 +2,12 @@
 is_versioned: true
 version_template: "{{ version }}"
 source_packages:
-  - postgresql16
+  - >
+    {%- if branch in ["c10f2"] -%}
+    postgresql16
+    {%- else -%}
+    postgresql17
+    {%- endif -%}
 annotations:
   org.opencontainers.image.revision: ''
   org.opencontainers.image.source: 'https://github.com/postgres/postgres'

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

@@ -14,4 +14,4 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

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

@@ -14,4 +14,4 @@ LABEL org.opencontainers.image.title="cert-manager-cainjector"
 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

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

@@ -14,4 +14,4 @@ LABEL org.opencontainers.image.title="cert-manager-controller"
 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

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

@@ -14,4 +14,4 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

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

@@ -14,4 +14,4 @@ LABEL org.opencontainers.image.title="cert-manager-webhook"
 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/coredns/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -6,7 +6,7 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 {% if pkg_versions and "k8s/coredns" in pkg_versions %}
 {% set num_version_parts = (pkg_versions["k8s/coredns"].split('.') | length) %}

org/k8s/etcd/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="etcd"
 LABEL org.opencontainers.image.description="Distributed reliable key-value store for the most critical data of a distributed system"
 LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 ARG PKG_VERSION
 

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

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

org/k8s/flannel/Dockerfile.template

@@ -6,7 +6,7 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 {{ install_packages(
     "iproute2",

org/k8s/kube-apiserver/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -14,4 +14,4 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -14,4 +14,4 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/kube-proxy/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -14,4 +14,4 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/kube-scheduler/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -14,4 +14,4 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

org/k8s/kubelet/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -14,4 +14,4 @@ LABEL org.opencontainers.image.title="kubelet" \
     org.opencontainers.image.description="An agent that runs on each node in the cluster. It makes sure that containers are running in a Pod." \
     org.opencontainers.image.source="https://github.com/kubernetes/kubernetes" \
     org.opencontainers.image.licenses="Apache-2.0" \
-    org.opencontainers.image.vendor="{{ label_vendor }}" \
+    org.opencontainers.image.vendor="ALT Linux Team" \

org/k8s/pause/Dockerfile.template

@@ -5,7 +5,7 @@ MAINTAINER alt-cloud
 LABEL org.opencontainers.image.title="pause" \
     org.opencontainers.image.description="Simple pause image" \
     org.opencontainers.image.licenses="GPLv2" \
-    org.opencontainers.image.vendor="{{ label_vendor }}"
+    org.opencontainers.image.vendor="ALT Linux Team"
 
 {{ install_packages("kubernetes-pause") }}
 

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

@@ -6,7 +6,7 @@ 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="{{ label_vendor }}"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 {{ install_packages(
     "k8s-trivy-node-collector",

test.py

@@ -1,192 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import json
-import logging
-import subprocess
-import os
-import tempfile
-from pathlib import Path
-
-import requests
-import yaml
-from jinja2 import Template
-
-from build import AltAPIError
-
-logger = logging.getLogger(__name__)
-
-def api_get_package_versions_from_task(task_id: str) -> dict[str, str]:
-    api_url = f"https://rdb.altlinux.org/api/task/packages/{task_id}"
-    response = requests.get(api_url)
-    if response.status_code != 200:
-        raise AltAPIError(
-            f"failed to retrieve kubernetes versions from task: task_id {task_id}"
-        )
-
-    result = response.json()
-
-    packages = {}
-    for subtask in result["subtasks"]:
-        packages[subtask["source"]["name"]] = subtask["source"]["version"]
-
-    return packages
-
-def api_get_latest_flannel_tag(branch: str):
-    api_url = f"https://registry.altlinux.org/v2/{branch}/flannel/tags/list"
-    response = requests.get(api_url)
-    if response.status_code != 200:
-        raise AltAPIError(
-            f"failed to get latest flannel version for branch {branch}"
-        )
-
-    result = response.json()
-
-    return result["tags"][-1]
-
-def run(cmd: list[str]):
-    global DRY_RUN
-
-    logger.debug("%s", cmd)
-    if not DRY_RUN:
-        subprocess.run(cmd, check=True)
-
-def parse_args():
-    log_levels = ["debug", "info", "warning", "error", "critical"]
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--log-level",
-        default="debug",
-        choices=log_levels,
-        help="log messages above specified level",
-    )
-    parser.add_argument(
-        "--dry-run",
-        action="store_true",
-        help="don't run commands",
-    )
-    parser.add_argument(
-        "--skip-packages",
-        nargs="+",
-        help="log messages above specified level",
-    )
-    parser.add_argument("branch")
-    parser.add_argument("task_id")
-    return parser.parse_args()
-
-def main():
-    global DRY_RUN
-
-    args = parse_args()
-    DRY_RUN = args.dry_run
-
-    numeric_level = getattr(logging, args.log_level.upper(), logging.DEBUG)
-    logging.basicConfig(
-        level=numeric_level, format="%(asctime)s - %(levelname)s\t- %(message)s"
-    )
-
-    package_versions = api_get_package_versions_from_task(args.task_id)
-    test_registry = "10.4.5.110:5000"
-    image_forge_dir = Path(".").resolve()
-    tests_dir = Path("../kubernetes-tests").resolve()
-
-    registry_prefix = args.branch
-    if args.branch == "c10f2":
-        registry_prefix = "c10f"
-
-    srpm_to_images = yaml.safe_load(Path("srpm_to_images.yaml").read_text())
-
-    temp_tasks_config = tempfile.NamedTemporaryFile(mode="w+", delete=False, delete_on_close=False)
-    temp_tasks_config.write(f"""\
-[{args.branch}]
-{args.task_id} = [{",".join([f'"{image}"' for pkg_name in package_versions if pkg_name in srpm_to_images for image in srpm_to_images[pkg_name]])}]
-""")
-    temp_tasks_config.close()
-
-    k8s_dir = image_forge_dir / "org" / "k8s"
-    image_to_version_template: dict[str, str | list[str]] = {}
-    for image_dir in k8s_dir.iterdir():
-        info_file = image_dir / "info.yaml"
-        info = yaml.safe_load(info_file.read_text())
-        image_to_version_template[f"{image_dir.parent.name}/{image_dir.name}"] = info.get("version_template", None)
-
-    run([
-        "podman",
-        "login",
-        test_registry,
-        "--username", "admin",
-        "--password", "123"
-    ])
-
-    flannel_tag = api_get_latest_flannel_tag(registry_prefix)
-    run(["skopeo", "copy", "-a", f"docker://registry.altlinux.org/{registry_prefix}/flannel:{flannel_tag}", f"docker://{test_registry}/{registry_prefix}/flannel:{flannel_tag}"])
-
-    if args.skip_packages is not None:
-        package_versions = {name: version for name, version in package_versions.items() if name not in args.skip_packages}
-
-    for pkg_name, pkg_version in package_versions.items():
-        os.chdir(image_forge_dir)
-
-        if pkg_name not in srpm_to_images:
-            continue
-
-        cmd = [
-            "./build.py",
-            "--branch", args.branch,
-            "--registry", "registry.altlinux.org",
-            "--overwrite-organization", registry_prefix,
-            "--skip-arches", "riscv64", "loong64",
-            "--skip-stage", "push",
-            "--log-level", "debug",
-            "--tasks", temp_tasks_config.name,
-            "-i",
-        ]
-
-
-        cmd += srpm_to_images[pkg_name]
-
-        version_for_template = pkg_version[:4]
-        if pkg_name.startswith("coredns-for-kubernetes") or pkg_name.startswith("etcd-for-kubernetes"):
-            version_for_template = pkg_name[-4:]
-
-        versions_arg = {image: version_for_template for image in srpm_to_images[pkg_name]}
-
-        cmd += [
-            "--package-versions",
-            json.dumps(versions_arg),
-        ]
-
-        run(cmd)
-
-        for image in srpm_to_images[pkg_name]:
-            version_template = image_to_version_template[image]
-
-            tags = []
-            if version_template is not None:
-                if isinstance(version_template, str):
-                    tags.append(Template(version_template).render(version=pkg_version).strip())
-                elif isinstance(version_template, list):
-                    for template in version_template:
-                        tags.append(Template(template).render(version=pkg_version).strip())
-            else:
-                tags = [pkg_version]
-
-            image_name = image[4:]
-            for tag in tags:
-                run([
-                    "podman",
-                    "manifest",
-                    "push",
-                    f"registry.altlinux.org/{registry_prefix}/{image_name}:{tag}",
-                    f"docker://{test_registry}/{registry_prefix}/{image_name}:{tag}"
-                ])
-
-    os.chdir(tests_dir)
-    for pkg_name, pkg_version in package_versions.items():
-        if pkg_name.startswith("kubernetes"):
-            run(["./run.sh", args.branch, pkg_version, flannel_tag, test_registry, args.task_id, "iptables"])
-
-
-if __name__ == "__main__":
-    main()

test.sh

@@ -1,122 +0,0 @@
-#!/bin/bash
-
-set -efu
-
-dry_run=0
-while true; do
-	case "$1" in
-		--dry-run)
-			dry_run=1
-			shift
-			;;
-		*)
-			break
-			;;
-	esac
-done
-
-r()
-{
-	if [[ $dry_run == 1 ]]; then
-		echo "$@"
-	else
-		"$@"
-	fi
-}
-
-branch=$1
-task_id=$2
-
-# kubernetes_package_versions=()
-declare -A kubernetes_package_versions
-api_url="https://rdb.altlinux.org/api/task/packages/$task_id"
-test_registry=10.4.5.110:5000
-image_forge_dir=$PWD
-tests_dir=$(realpath ../kubernetes-tests)
-kubernetes_images=(k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-scheduler k8s/kube-proxy k8s/kubelet)
-temp_tasks_config=$(mktemp)
-
-registry_prefix=$branch
-if [[ $branch == c10f2 ]]; then
-	registry_prefix=c10f
-fi
-
-api_response=$(curl -s "$api_url")
-
-while read -r subtask; do
-	package_name=$(jq -r '.source.name' <<< "$subtask")
-	package_version=$(jq -r '.source.version' <<< "$subtask")
-	if [[ $package_name =~ ^kubernetes1\.[0-9]{2}$ ]]; then
-		kubernetes_package_versions[$package_name]=$package_version
-	elif [[ $package_name =~ ^etcd-for-kubernetes ]]; then
-		kubernetes_package_versions[$package_name]=$package_version
-	fi
-done < <(jq -c '.subtasks[]' <<< "$api_response")
-
-printf -v kubernetes_images_joined '"%s", ' "${kubernetes_images[@]}"
-cat <<EOF > "$temp_tasks_config"
-[$branch]
-$task_id = [${kubernetes_images_joined%, }]
-EOF
-
-r podman login "$test_registry" --username admin --password 123
-
-flannel_tag=$(curl -s "https://registry.altlinux.org/v2/$registry_prefix/flannel/tags/list" | jq -r '.tags[-1]')
-r skopeo copy -a "docker://registry.altlinux.org/$registry_prefix/flannel:$flannel_tag" "docker://$test_registry/$registry_prefix/flannel:$flannel_tag"
-
-if [[ ${!kubernetes_package_versions[*]} =~ cni-plugin-flannel ]]; then
-	r ./build.py \
-	    --branch "$branch" \
-	    --registry registry.altlinux.org \
-	    --overwrite-organization "$registry_prefix" \
-	    --skip-arches riscv64 loong64 \
-	    --skip-stage push \
-	    --log-level debug \
-	    --tasks "$temp_tasks_config" \
-	    -i k8s/flannel-cni-plugin
-
-	r podman manifest push "registry.altlinux.org/$registry_prefix/flannel-cni-plugin:v$version" "docker://$test_registry/$registry_prefix/$image_name:v$version"
-fi
-
-for name in "${!kubernetes_package_versions[@]}"; do
-	version=${kubernetes_package_versions[$name]}
-	images=()
-	versions='{'
-	if [[ $name =~ ^kubernetes1\.[0-9]{2}$ ]]; then
-		images+=("${kubernetes_images[@]}")
-		for image in "${kubernetes_images[@]}"; do
-			versions+="\"$image\":\"${version::4}\","
-		done
-	fi
-	if [[ $name =~ ^etcd-for-kubernetes(1\.[0-9]{2})$ ]]; then
-		images+=("k8s/etcd")
-		versions+="\"k8s/etcd\":\"${BASH_REMATCH[1]::4}\","
-	fi
-	versions="${versions%,}}"
-
-	cd "$image_forge_dir"
-	r ./build.py \
-	    --branch "$branch" \
-	    --registry registry.altlinux.org \
-	    --overwrite-organization "$registry_prefix" \
-	    --skip-arches riscv64 loong64 \
-	    --skip-stage push \
-	    --log-level debug \
-	    --tasks "$temp_tasks_config" \
-	    -i "${images[@]}" \
-	    --package-versions "$versions"
-
-	for image in "${images[@]}"; do
-		image_name=${image:4}
-		r podman manifest push "registry.altlinux.org/$registry_prefix/$image_name:v$version" "docker://$test_registry/$registry_prefix/$image_name:v$version"
-		if [[ $image_name == etcd ]]; then
-			r podman manifest push "registry.altlinux.org/$registry_prefix/$image_name:v$version" "docker://$test_registry/$registry_prefix/$image_name:$version-0"
-			r podman manifest push "registry.altlinux.org/$registry_prefix/$image_name:v$version" "docker://$test_registry/$registry_prefix/$image_name:$version"
-		fi
-	done
-done
-
-if [[  =~ ^kubernetes1\.[0-9]{2}$ ]]; then
-	cd "$tests_dir"
-	r ./run.sh "$branch" "$version" "$flannel_tag" "$test_registry" "$task_id" iptables
-fi