fix(build.py): add console parameter --clean-images-limit to on/off period-cleaning images from builder host

fix(build.py): add console parameter to set different push registry (overwrite-registry)
fix(build.py): add cleaning images during building process to fix workflow's error 'no space left on device'
2025-07-08 16:35:22 +03:00 · 2025-06-26 15:41:18 +03:00 · 2025-06-26 15:39:09 +03:00
77 changed files with 66 additions and 776 deletions
--- a/.gitea/workflows/wf_full.yaml
+++ b/.gitea/workflows/wf_full.yaml
@ -52,8 +52,6 @@ jobs:
          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-          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 }}
      - name: Set repo for c10f2 (Temporary)
--- a/.gitea/workflows/wf_k8s.yaml
+++ b/.gitea/workflows/wf_k8s.yaml
@ -58,8 +58,6 @@ jobs:
          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-          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 }}
      - name: Login podman gitea
--- a/.gitea/workflows/wf_single.yaml
+++ b/.gitea/workflows/wf_single.yaml
@ -75,8 +75,6 @@ jobs:
          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-          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 }}
      - name: Get test for image
--- a/build.py
+++ b/build.py
@ -20,7 +20,7 @@ from jinja2 import Environment, BaseLoader

 logger = logging.getLogger(__name__)
 clean_images_counter = 0
-clean_images_limit_count = 5
+clean_images_limit_count = 0

 ORG_DIR = Path("org")

@ -39,7 +39,6 @@ class Image:
    is_versioned: Optional[bool]
    version_template: Union[list[str], str, None]
    source_packages: Optional[list[str]]
-    annotations: Optional[dict[str, str]]

    def __init__(self, canonical_name: str):
        self.canonical_name = canonical_name
@ -50,7 +49,6 @@ class Image:
        if not info_file.exists():
            self.is_versioned = None
            self.source_packages = None
-            self.annotations = None
            return

        info: dict = yaml.safe_load(info_file.read_text())
@ -77,10 +75,6 @@ class Image:
        if "version_template" in info:
            self.version_template = info["version_template"]

-        self.annotations = None
-        if "annotations" in info:
-            self.annotations = info["annotations"]
-

 class Tasks:
    def __init__(self, tasks):
@ -244,7 +238,7 @@ class Tags:
                tags.append("latest")
        else:
            tags = self._tags[image.canonical_name][branch].copy()
-        
+
        return tags


@ -349,6 +343,7 @@ class DockerBuilder:
    def __init__(
        self,
        registry,
+        overwrite_registry,
        branch,
        organization,
        overwrite_organization,
@ -363,6 +358,7 @@ class DockerBuilder:
        self.org_dir = ORG_DIR
        self.images_dir = ORG_DIR / organization
        self.registry = registry
+        self.overwrite_registry = overwrite_registry
        self.branch = branch
        self.organization = organization
        if overwrite_organization:
@ -519,6 +515,15 @@ class DockerBuilder:
            tag = f":{tag}"
        return f"{registry}{self.overwrite_organization}/{image.base_name}{tag}"

+    def render_push_registry(self, image: Image, tag: str):
+        if self.overwrite_registry:
+            registry = self.overwrite_registry.rstrip("/") + "/"
+        else:
+            registry = ""
+        if tag:
+            tag = f":{tag}"
+        return f"{registry}{self.overwrite_organization}/{image.base_name}{tag}"
+
    def run(self, cmd, *args, **kwargs):
        if "check" not in kwargs:
            kwargs["check"] = True
@ -529,9 +534,6 @@ class DockerBuilder:

        logger.debug("run: %s", pre_cmd + cmd)
        subprocess.run(pre_cmd + cmd, *args, **kwargs)
-    
-    def run_with_result(self, cmd):
-        return subprocess.run(cmd, stdout=subprocess.PIPE).stdout.decode('utf-8')

    def distroless_build(self, image: Image, arches):
        def distroless_build_arch(arch, manifest):
@ -771,81 +773,62 @@ class DockerBuilder:
            f"--platform={platforms}",
            ".",
        ]
-        
-        if image.annotations != None:
-            build_cmd = [                                                                    
-                "podman",                                                                      
-                "build",                                                                       
-                "--rm",                                                                        
-                "--force-rm",                                                                  
-                f"--manifest={manifest}",                                                      
-                f"--platform={platforms}"
-            ]
-            for akey, avalue in image.annotations.items():                                                   
-                build_cmd.append(                                                                
-                    f"--annotation={akey}={avalue}")

-            d = datetime.now()
-            build_cmd.append(f"--annotation=org.opencontainers.image.created={d.isoformat("T") + "Z"}")
-
-            ver = next((tag for tag in tags if tag != 'latest'), '')
-            if ver != '':
-                build_cmd.append(f"--annotation=org.opencontainers.image.version={ver}")
-
-            build_cmd.append(".")
-        
        if PKG_VERSIONS is not None and image.canonical_name in PKG_VERSIONS:
            build_cmd.insert(
                -1, f"--build-arg=PKG_VERSION={PKG_VERSIONS[image.canonical_name]}"
            )

        self.run(build_cmd, cwd=image.path)
-        
+
        for tag in tags[1:]:
            other_manifest = self.render_full_tag(image, tag)
            tag_cmd = ["podman", "tag", manifest, other_manifest]
            self.run(tag_cmd)
-            
-       
+
    def podman_push(self, image: Image, sign=None):
        if self.images_info.skip_branch(image.canonical_name, self.branch):
            return

        tags = self.tags.tags(self.branch, image, self.tasks)
-        manifests = [self.render_full_tag(image, t) for t in tags]

-        for manifest in manifests:
-            print(f"Push manifest {manifest}")
+        for t in tags:
+            manifest = self.render_full_tag(image, t)
+            push_manifest = self.render_push_registry(image, t)
+
+            print(f"Source manifest {manifest}")
+            print(f"Push manifest {push_manifest}")
            cmd = [
                "podman",
                "manifest",
                "push",
                manifest,
-                f"docker://{manifest}",
+                f"docker://{push_manifest}",
            ]

            if sign is not None:
                cmd.append(f"--sign-by={sign}")

            self.run(cmd)
+        
+        if clean_images_limit_count > 0:
+            global clean_images_counter

-        global clean_images_counter
-
-        if clean_images_limit_count <= clean_images_counter:
-            cmd = [
-                "podman",
-                "rmi",
-                "--all",
-                "-f",
-            ]
-            self.run(cmd,
-                check=False,
-                stderr=subprocess.DEVNULL,
-                stdout=subprocess.DEVNULL,
-            )
-            clean_images_counter = 0
-        else:
-            clean_images_counter += 1
+            if clean_images_limit_count <= clean_images_counter:
+                cmd = [
+                    "podman",
+                    "rmi",
+                    "--all",
+                    "-f",
+                ]
+                self.run(cmd,
+                    check=False,
+                    stderr=subprocess.DEVNULL,
+                    stdout=subprocess.DEVNULL,
+                )
+                clean_images_counter = 0
+            else:
+                clean_images_counter += 1


 class ImagesInfo:
@ -917,9 +900,22 @@ def parse_args():
        "-r",
        "--registry",
        default="gitea.basealt.ru",
+        help="source registry",
+    )
+    parser.add_argument(                                                                           
+        "--clean-images-limit",                                                                    
+        default="5",
+        type=int,
+        help="limit count of local images, '0' - no clean mode",
+    )
+    parser.add_argument(
+        "--overwrite-registry",
+        default="gitea.basealt.ru",
+        help="destination registry",
    )
    parser.add_argument(
        "--overwrite-organization",
+        help="destination organization",
    )
    parser.add_argument(
        "-l",
@ -1007,6 +1003,9 @@ def parse_args():
    args.branches = set(args.branches) - set(args.skip_branches)
    args.images = set(args.images) - set(args.skip_images)

+    global clean_images_limit_count
+    clean_images_limit_count = args.clean_images_limit
+
    return args


@ -1030,6 +1029,7 @@ def main():
        for branch in args.branches:
            db = DockerBuilder(
                args.registry,
+                args.overwrite_registry,
                branch,
                organization,
                args.overwrite_organization,
--- a/images-info.toml
+++ b/images-info.toml
@ -7,32 +7,8 @@ skip-arches = [ "386" ]
 ["alt/zot"]
 skip-arches = [ "386" ]

-["alt/kafka"]
-skip-arches = [ "386" ]
-
 ["alt/ansible"]
 skip-branches = [ "c10f2", "c10f1", "p10" ]

 ["alt/buildkit"]
 skip-branches = [ "c10f1", "p10" ]
-
-["kubevirt/virt-api"]
-skip-arches = [ "386", "loong64" ]
-
-["kubevirt/virt-controller"]
-skip-arches = [ "386", "loong64" ]
-
-["kubevirt/virt-exportproxy"]
-skip-arches = [ "386", "loong64" ]
-
-["kubevirt/virt-exportserver"]
-skip-arches = [ "386", "loong64" ]
-
-["kubevirt/virt-handler"]
-skip-arches = [ "386", "loong64" ]
-
-["kubevirt/virt-launcher"]
-skip-arches = [ "386", "loong64" ]
-
-["kubevirt/virt-operator"]
-skip-arches = [ "386", "loong64" ]
--- a/org/alt/ansible/info.yaml
+++ b/org/alt/ansible/info.yaml
@ -5,13 +5,4 @@ source_packages:
  - ansible-core
  - ansible-vim
  - ansible-lint
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'http://www.ansible.com'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'ansible'
-  org.opencontainers.image.description: 'A radically simple IT automation system'
-  org.opencontainers.image.licenses: GPL-3.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/apache2/info.yaml
+++ b/org/alt/apache2/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - apache2
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'http://httpd.apache.org'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'apache2'
-  org.opencontainers.image.description: 'The most widely used Web server on the Internet'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/buildkit/info.yaml
+++ b/org/alt/buildkit/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - buildkit
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/moby/buildkit'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'buildkit'
-  org.opencontainers.image.description: 'Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/gitea/info.yaml
+++ b/org/alt/gitea/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - gitea
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/go-gitea/gitea'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'gitea'
-  org.opencontainers.image.description: 'Git with a cup of tea, painless self-hosted git service'
-  org.opencontainers.image.licenses: MIT
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/golang/info.yaml
+++ b/org/alt/golang/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - golang
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/golang/go'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'golang'
-  org.opencontainers.image.description: 'The Golang environment for development'
-  org.opencontainers.image.licenses: BSD
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/grafana/info.yaml
+++ b/org/alt/grafana/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - grafana
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/grafana/grafana'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'grafana'
-  org.opencontainers.image.description: 'Metrics dashboard and graph editor'
-  org.opencontainers.image.licenses: 'AGPL-3.0-only AND Apache-2.0'
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/kafka/Dockerfile.template
+++ b/org/alt/kafka/Dockerfile.template
@ -1,21 +0,0 @@
-FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="kafka"
-LABEL org.opencontainers.image.description="Apache Kafka is a distributed event store and stream-processing platform"
-LABEL org.opencontainers.image.source="https://github.com/apache/kafka"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("kafka", "ca-certificates", "gpg") }}
-
-USER kafka:kafka
-EXPOSE 9092 2181
-WORKDIR /var/lib/kafka
-VOLUME ["/var/lib/kafka","/var/log/kafka"]
-
-COPY kafka-entrypoint.sh /kafka-entrypoint.sh
-
-ENTRYPOINT [ "/bin/bash" ]
-CMD ["/kafka-entrypoint.sh"]
--- a/org/alt/kafka/README.md
+++ b/org/alt/kafka/README.md
@ -1,37 +0,0 @@
-# Kafka image
-
-Command for run kafka server:
-```
-podman run --rm -it -p 9092:9092 <REGISTRY>/<BRANCH>/kafka:latest
-```
-
-To lead images running need use kafka-entrypoint.sh or change it. As default login kafka need runnig zookeeper and than kafka's start script. 
-
-Commnad for using kafka:
-```
-podman exec -it -u kafka <CONTAINER ID> /usr/bin/sh
-```
-```
-sh-5.2$ /usr/lib/kafka/bin/kafka-topics.sh --create --topic quickstart-events --bootstrap-server localhost:9092
-```
-Created topic quickstart-events.
-```
-sh-5.2$ /usr/lib/kafka/bin/kafka-topics.sh --describe --topic quickstart-events --bootstrap-server localhost:9092
-```
-Topic: quickstart-events	TopicId: kPjhCFFAS-Sg5J3Hpgr-PA	PartitionCount: 1	ReplicationFactor: 1	Configs: 
-	Topic: quickstart-events	Partition: 0	Leader: 0	Replicas: 0	Isr: 0	Elr: N/A	LastKnownElr: N/A
-```
-sh-5.2$ /usr/lib/kafka/bin/kafka-console-producer.sh --topic quickstart-events --bootstrap-server localhost:9092
-```
->hello 1
->hello 2
->hello 3
-```
-sh-5.2$ /usr/lib/kafka/bin/kafka-console-consumer.sh --topic quickstart-events --from-beginning --bootstrap-server localhost:9092
-```
-hello 1
-hello 2
-hello 3
-^CProcessed a total of 3 messages
-
-
--- a/org/alt/kafka/info.yaml
+++ b/org/alt/kafka/info.yaml
@ -1,15 +0,0 @@
---
-is_versioned: true
-version_template: "{{ version }}"
-source_packages:
-  - kafka
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/apache/kafka'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'kafka'
-  org.opencontainers.image.description: 'Apache Kafka is a distributed event store and stream-processing platform'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
-...
--- a/org/alt/kafka/kafka-entrypoint.sh
+++ b/org/alt/kafka/kafka-entrypoint.sh
@ -1,4 +0,0 @@
-#!/bin/sh -eux
-
-nohup /usr/lib/kafka/bin/zookeeper-server-start.sh /etc/kafka/zookeeper.properties &
-/usr/lib/kafka/bin/kafka-server-start.sh /etc/kafka/server.properties
--- a/org/alt/kafka/test
+++ b/org/alt/kafka/test
@ -1 +0,0 @@
-ls -a /usr/lib/kafka/bin/ | grep kafka && /usr/lib/kafka/bin/kafka-topics.sh --version
--- a/org/alt/loki/info.yaml
+++ b/org/alt/loki/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - loki
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/grafana/loki'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'loki'
-  org.opencontainers.image.description: 'Like Prometheus, but for logs'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/nginx/info.yaml
+++ b/org/alt/nginx/info.yaml
@ -5,13 +5,4 @@ source_packages:
  - nginx
  - apache2
  - tzdata
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://nginx.org/'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'nginx'
-  org.opencontainers.image.description: 'Fast HTTP server, extremely useful as an Apache frontend'
-  org.opencontainers.image.licenses: BSD
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/node/info.yaml
+++ b/org/alt/node/info.yaml
@ -4,13 +4,4 @@ version_template: "{{ version }}"
 source_packages:
  - node
  - yarn
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/nodejs/node'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'node'
-  org.opencontainers.image.description: 'Evented I/O for V8 Javascript'
-  org.opencontainers.image.licenses: MIT
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/openjdk21/info.yaml
+++ b/org/alt/openjdk21/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - java-21-openjdk
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://openjdk-sources.osci.io'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'openjdk21'
-  org.opencontainers.image.description: 'OpenJDK 21 Runtime Environment'
-  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'
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/php/info.yaml
+++ b/org/alt/php/info.yaml
@ -8,13 +8,4 @@ source_packages:
    {%- else -%}
    php8.3
    {%- endif -%}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/php/php-src'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'php'
-  org.opencontainers.image.description: 'The PHP language environment for development'
-  org.opencontainers.image.licenses: PHP-3.01
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/postgresql/info.yaml
+++ b/org/alt/postgresql/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - postgresql16
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/postgres/postgres'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'postgresql16'
-  org.opencontainers.image.description: 'PostgreSQL rograms and libraries'
-  org.opencontainers.image.licenses: PostgreSQL
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/prometheus-alertmanager/Dockerfile.template
+++ b/org/alt/prometheus-alertmanager/Dockerfile.template
@ -2,7 +2,7 @@ FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="prometheus-alertmanager"
+LABEL org.opencontainers.image.title="alertmanager"
 LABEL org.opencontainers.image.description="The Alertmanager handles alerts sent by client applications"
 LABEL org.opencontainers.image.source="https://github.com/prometheus/alertmanager"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
--- a/org/alt/prometheus-alertmanager/info.yaml
+++ b/org/alt/prometheus-alertmanager/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - prometheus-alertmanager
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/prometheus/alertmanager'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'prometheus-alertmanager'
-  org.opencontainers.image.description: 'The Alertmanager handles alerts sent by client applications'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/prometheus-node_exporter/info.yaml
+++ b/org/alt/prometheus-node_exporter/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - prometheus-node_exporter
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/prometheus/node_exporter'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'prometheus-node_exporter'
-  org.opencontainers.image.description: 'Prometheus exporter for hardware and OS metrics exposed by *NIX kernels'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/prometheus/info.yaml
+++ b/org/alt/prometheus/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - prometheus
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/prometheus/prometheus'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'prometheus'
-  org.opencontainers.image.description: 'Prometheus monitoring system and time series database'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/python/info.yaml
+++ b/org/alt/python/info.yaml
@ -6,13 +6,4 @@ source_packages:
  - python3-module-setuptools
  - python3-module-pip
  - gcc-defaults
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/python/cpython'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'python'
-  org.opencontainers.image.description: 'Python 3 and tools needed for development'
-  org.opencontainers.image.licenses: Python
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/python2/info.yaml
+++ b/org/alt/python2/info.yaml
@ -5,13 +5,4 @@ source_packages:
  - python
  - python-module-setuptools
  - gcc-defaults
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://www.python.org/downloads/source'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'python'
-  org.opencontainers.image.description: 'Python 2 and tools needed for development'
-  org.opencontainers.image.licenses: Python-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/rabbitmq/info.yaml
+++ b/org/alt/rabbitmq/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - rabbitmq-server
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/rabbitmq/rabbitmq-server'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'rabbitmq'
-  org.opencontainers.image.description: 'The RabbitMQ server'
-  org.opencontainers.image.licenses: MPL-1.1
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/redis/Dockerfile.template
+++ b/org/alt/redis/Dockerfile.template
@ -1,19 +0,0 @@
-FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="redis"
-LABEL org.opencontainers.image.description="Redis is an advanced key-value store"
-LABEL org.opencontainers.image.source="http://redis.io"
-LABEL org.opencontainers.image.licenses="BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("ca-certificates","redis","redis-cli") }}
-
-USER _redis:_redis
-EXPOSE 6379
-VOLUME ["/var/lib/redis","/var/log/redis"]
-WORKDIR /var/lib/redis
-
-ENTRYPOINT [ "/usr/sbin/redis-server" ]
-CMD [ "/etc/redis/redis.conf" ]
--- a/org/alt/redis/README.md
+++ b/org/alt/redis/README.md
@ -1,8 +0,0 @@
-# Redis image
-
-Command for run redis-db server:
-```
-podman run --rm -it -v ./redis.conf:/etc/redis/redis.conf -p 6379:6379 <REGISTRY>/<BRANCH>/redis:latest
-```
-For testing running server you can run redis.py, if it's working you will see version redis
-
--- a/org/alt/redis/info.yaml
+++ b/org/alt/redis/info.yaml
@ -1,15 +0,0 @@
---
-is_versioned: true
-version_template: "{{ version }}"
-source_packages:
-  - redis
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'http://redis.io/'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'redis'
-  org.opencontainers.image.description: 'Redis is an advanced key-value store'
-  org.opencontainers.image.licenses: 'BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0'
-  org.opencontainers.image.vendor: 'ALT Linux Team'
-...
--- a/org/alt/redis/redis.py
+++ b/org/alt/redis/redis.py
@ -1,22 +0,0 @@
-#!/usr/bin/python3
-
-import redis
-
-
-def main():
-    r = redis.Redis(host='127.0.0.1', port=6379, db=0, username='test', password='test')
-
-    try:
-        info = r.info()
-        print(info['redis_version'])
-        response = r.ping()
-        if response:
-            print("Подключение успешно!")
-        else:
-            print("Не удалось подключиться к Redis.")
-    except redis.exceptions.RedisError as e:
-        print(f"Ошибка: {e}")
-
-if __name__ == "__main__":
-    main()
-
--- a/org/alt/redis/test
+++ b/org/alt/redis/test
@ -1 +0,0 @@
-redis-cli --version && redis-server --version
--- a/org/alt/redis/test.redis.conf
+++ b/org/alt/redis/test.redis.conf
@ -1,5 +0,0 @@
-bind 0.0.0.0
-requirepass test
-appendonly yes
-appendfsync everysec
-user test on -DEBUG +@all ~* >test
--- a/org/alt/registry/info.yaml
+++ b/org/alt/registry/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - docker-registry
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/docker/distribution'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'registry'
-  org.opencontainers.image.description: 'The Docker toolset to pack, ship, store, and deliver content'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/ruby/info.yaml
+++ b/org/alt/ruby/info.yaml
@ -8,13 +8,4 @@ source_packages:
    {%- else -%}
    gem-irb
    {%- endif -%}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/ruby/ruby'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'ruby'
-  org.opencontainers.image.description: 'Interactive Ruby Shell'
-  org.opencontainers.image.licenses: 'BSD-2-Clause or Ruby'
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/systemd/info.yaml
+++ b/org/alt/systemd/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - systemd
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/systemd/systemd'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'systemd'
-  org.opencontainers.image.description: 'System and Session Manager'
-  org.opencontainers.image.licenses: LGPLv2.1+
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/trivy/info.yaml
+++ b/org/alt/trivy/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - trivy
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://aquasecurity.github.io/trivy'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'trivy'
-  org.opencontainers.image.description: 'A Fast Vulnerability Scanner for Containers'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/unit/info.yaml
+++ b/org/alt/unit/info.yaml
@ -5,13 +5,4 @@ source_packages:
  - unit
  - curl
  - tzdata
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/nginx/unit'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'unit'
-  org.opencontainers.image.description: 'NGINX Unit is a lightweight and versatile web-server'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/alt/zot/info.yaml
+++ b/org/alt/zot/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - zot
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/project-zot/zot'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'zot'
-  org.opencontainers.image.description: 'A production-ready vendor-neutral OCI-native container image registry (purely based on OCI Distribution Specification)'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/base/info.yaml
+++ b/org/base/base/info.yaml
@ -4,13 +4,4 @@ version_template: "{{ version }}"
 source_packages:
  - glibc
  - tzdata
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: base
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
-  org.opencontainers.image.description: 'Base image with localization and timezone packages'
 ...
--- a/org/base/buildpack-deps-curl/info.yaml
+++ b/org/base/buildpack-deps-curl/info.yaml
@ -6,13 +6,4 @@ source_packages:
  - curl
  - gnupg
  - wget
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'buildpack-deps-curl'
-  org.opencontainers.image.description: 'Transfer data environment'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/buildpack-deps-scm/info.yaml
+++ b/org/base/buildpack-deps-scm/info.yaml
@ -7,13 +7,4 @@ source_packages:
  - openssh
  - procps
  - subversion
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'buildpack-deps-scm'
-  org.opencontainers.image.description: 'Software configuration management environment'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/buildpack-deps/info.yaml
+++ b/org/base/buildpack-deps/info.yaml
@ -3,13 +3,4 @@ is_versioned: false
 version_template: "{{ version }}"
 source_packages:
  - gcc-defaults
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'buildpack-deps'
-  org.opencontainers.image.description: 'Projects building environment'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/devel/info.yaml
+++ b/org/base/devel/info.yaml
@ -14,13 +14,4 @@ source_packages:
  - ripgrep
  - zsh
  - make
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'devel'
-  org.opencontainers.image.description: 'This image is only for devel or testing purposes'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-base/info.yaml
+++ b/org/base/distroless-base/info.yaml
@ -6,13 +6,4 @@ source_packages:
  - tzdata
  - zlib
  - libselinux
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-base'
-  org.opencontainers.image.description: 'Base image for running dynamically linked programs'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-builder/info.yaml
+++ b/org/base/distroless-builder/info.yaml
@ -4,13 +4,4 @@ version_template: "{{ version }}"
 source_packages:
  - glibc
  - apt-repo
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-builder'
-  org.opencontainers.image.description: 'This image is used to build tarballs for distroless images'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-devel/info.yaml
+++ b/org/base/distroless-devel/info.yaml
@ -7,13 +7,4 @@ source_packages:
  - glibc
  - iproute2
  - vim
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-devel'
-  org.opencontainers.image.description: 'Base image for creating and debugging distroless images'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-gotop/info.yaml
+++ b/org/base/distroless-gotop/info.yaml
@ -3,13 +3,4 @@ is_versioned: false
 version_template: "{{ version }}"
 source_packages:
  - gotop
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-gotop'
-  org.opencontainers.image.description: 'Gotop image'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-static/info.yaml
+++ b/org/base/distroless-static/info.yaml
@ -3,13 +3,4 @@ is_versioned: false
 version_template: "{{ version }}"
 source_packages:
  - distroless-static
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-static'
-  org.opencontainers.image.description: 'Base image for running statically linked programs'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-toybox/info.yaml
+++ b/org/base/distroless-toybox/info.yaml
@ -3,13 +3,4 @@ is_versioned: false
 version_template: "{{ version }}"
 source_packages:
  - toybox
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-toybox'
-  org.opencontainers.image.description: 'Base image with toybox environment'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/base/distroless-true/info.yaml
+++ b/org/base/distroless-true/info.yaml
@ -3,13 +3,4 @@ is_versioned: false
 version_template: "{{ version }}"
 source_packages:
  - distroless-true
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'distroless-true'
-  org.opencontainers.image.description: 'True-command image for zero status returning'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/cert-manager-acmesolver/info.yaml
+++ b/org/k8s/cert-manager-acmesolver/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - cert-manager
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/cert-manager/cert-manager'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'cert-manager-acmesolver'
-  org.opencontainers.image.description: 'HTTP server used to solve ACME challenges'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/cert-manager-cainjector/info.yaml
+++ b/org/k8s/cert-manager-cainjector/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - cert-manager
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/cert-manager/cert-manager'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'cert-manager-cainjector'
-  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'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/cert-manager-controller/info.yaml
+++ b/org/k8s/cert-manager-controller/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - cert-manager
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/cert-manager/cert-manager'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'cert-manager-controller'
-  org.opencontainers.image.description: 'Automatically provision and manage TLS certificates in Kubernetes'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/cert-manager-startupapicheck/info.yaml
+++ b/org/k8s/cert-manager-startupapicheck/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - cert-manager
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/cert-manager/cert-manager'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'cert-manager-startupapicheck'
-  org.opencontainers.image.description: 'Check that cert-manager started successfully'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/cert-manager-webhook/info.yaml
+++ b/org/k8s/cert-manager-webhook/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - cert-manager
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/cert-manager/cert-manager'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'cert-manager-webhook'
-  org.opencontainers.image.description: 'The webhook component provides API validation, mutation and conversion functionality for cert-manager'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/coredns/Dockerfile.template
+++ b/org/k8s/coredns/Dockerfile.template
@ -9,16 +9,15 @@ LABEL org.opencontainers.image.licenses="Apache-2.0"
 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) %}
+{% set version_parts = pkg_versions["k8s/coredns"].split('.') | length %}
 {% else %}
-{% set num_version_parts = 0 %}
+{% set version_parts = 0 %}
 {% endif %}
-
-{% if num_version_parts == 2 %}
+{% if branch in ["sisyphus"] and version_parts == 2 %}
 ARG PKG_VERSION

 {{ install_packages("coredns-for-kubernetes${PKG_VERSION}") }}
-{% elif num_version_parts == 3 %}
+{% elif branch in ["sisyphus", "p11", "c10f2"] and version_parts == 3 %}
 ARG PKG_VERSION

 {{ install_packages("coredns${PKG_VERSION}") }}
--- a/org/k8s/coredns/info.yaml
+++ b/org/k8s/coredns/info.yaml
@ -3,21 +3,13 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - >
-    {%- set num_version_parts = (version.split('.') | length) -%}
-    {%- if num_version_parts == 2 -%}
+    {%- set version_parts = version.split('.') -%}
+    {%- set version_major = version_parts[1] | int -%}
+    {%- if branch in ["sisyphus"] and version_parts | length == 2 and version_major >= 33 -%}
    coredns-for-kubernetes{{ version }}
-    {%- elif num_version_parts == 3 -%}
+    {%- elif branch in ["sisyphus", "p11", "c10f2"] -%}
    coredns{{ version }}
    {%- else -%}
    coredns
    {%- endif -%}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/coredns/coredns'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'coredns'
-  org.opencontainers.image.description: 'CoreDNS is a DNS server that chains plugins'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/etcd/info.yaml
+++ b/org/k8s/etcd/info.yaml
@ -6,13 +6,4 @@ version_template:
  - "{{ version }}-0"
 source_packages:
  - etcd-for-kubernetes{{ version }}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/etcd-io/etcd'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'etcd'
-  org.opencontainers.image.description: 'Distributed reliable key-value store for the most critical data of a distributed system'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/flannel-cni-plugin/info.yaml
+++ b/org/k8s/flannel-cni-plugin/info.yaml
@ -15,13 +15,4 @@ version_template: >-
  {%- endif %}
 source_packages:
  - cni-plugin-flannel
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/flannel-io/cni-plugin'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'flannel-cni-plugin'
-  org.opencontainers.image.description: 'CNI network plugin that is powered by flannel'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/flannel/info.yaml
+++ b/org/k8s/flannel/info.yaml
@ -2,13 +2,3 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - flannel
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/flannel-io/flannel'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'flannel'
-  org.opencontainers.image.description: 'Network fabric for containers'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
-...
--- a/org/k8s/kube-apiserver/info.yaml
+++ b/org/k8s/kube-apiserver/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - kubernetes{{ version }}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubernetes/kubernetes'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'kube-apiserver'
-  org.opencontainers.image.description: 'The Kubernetes API server validates and configures data for the api objects which include pods, services, replicationcontrollers, and others'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/kube-controller-manager/info.yaml
+++ b/org/k8s/kube-controller-manager/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - kubernetes{{ version }}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubernetes/kubernetes'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'kube-controller-manager'
-  org.opencontainers.image.description: 'The Kubernetes controller manager is a daemon that embeds the core control loops shipped with Kubernetes'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/kube-proxy/info.yaml
+++ b/org/k8s/kube-proxy/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - kubernetes{{ version }}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubernetes/kubernetes'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'kube-proxy'
-  org.opencontainers.image.description: 'The Kubernetes network proxy runs on each node'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/kube-scheduler/info.yaml
+++ b/org/k8s/kube-scheduler/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - kubernetes{{ version }}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubernetes/kubernetes'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'kube-scheduler'
-  org.opencontainers.image.description: 'The Kubernetes scheduler is a control plane process which assigns Pods to Nodes'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/kubelet/info.yaml
+++ b/org/k8s/kubelet/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
  - kubernetes{{ version }}
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubernetes/kubernetes'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  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.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/pause/info.yaml
+++ b/org/k8s/pause/info.yaml
@ -2,13 +2,4 @@
 is_versioned: true
 source_packages:
  - kubernetes-pause
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: ''
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'pause'
-  org.opencontainers.image.description: 'Simple pause image'
-  org.opencontainers.image.licenses: GPLv2
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/k8s/trivy-node-collector/info.yaml
+++ b/org/k8s/trivy-node-collector/info.yaml
@ -2,13 +2,4 @@
 is_versioned: true
 source_packages:
  - k8s-trivy-node-collector
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/aquasecurity/k8s-node-collector'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'trivy-node-collector'
-  org.opencontainers.image.description: 'Open source collector who collect Node information (fs and process data) and output in a table/json format'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-api/info.yaml
+++ b/org/kubevirt/virt-api/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-api'
-  org.opencontainers.image.description: 'Kubevirt API server'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-controller/info.yaml
+++ b/org/kubevirt/virt-controller/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-controller'
-  org.opencontainers.image.description: 'Controller for kubevirt'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-exportproxy/info.yaml
+++ b/org/kubevirt/virt-exportproxy/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-exportproxy'
-  org.opencontainers.image.description: 'Export proxy for kubevirt'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-exportserver/info.yaml
+++ b/org/kubevirt/virt-exportserver/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-exportserver'
-  org.opencontainers.image.description: 'Export server for kubevirt'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-handler/info.yaml
+++ b/org/kubevirt/virt-handler/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-handler'
-  org.opencontainers.image.description: 'Handler component for kubevirt'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-launcher/info.yaml
+++ b/org/kubevirt/virt-launcher/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-launcher'
-  org.opencontainers.image.description: 'Launcher component for kubevirt'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
--- a/org/kubevirt/virt-operator/info.yaml
+++ b/org/kubevirt/virt-operator/info.yaml
@ -3,13 +3,4 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
  - kubevirt
-annotations:
-  org.opencontainers.image.revision: ''
-  org.opencontainers.image.source: 'https://github.com/kubevirt/kubevirt'
-  org.opencontainers.image.url: ''
-  org.opencontainers.image.version: ''
-  org.opencontainers.image.title: 'virt-operator'
-  org.opencontainers.image.description: 'Operator component for kubevirt'
-  org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.vendor: 'ALT Linux Team'
 ...
Author	SHA1	Message	Date
Nadezhda Fedorova	1d4fe7b532	fix(build.py): add console parameter --clean-images-limit to on/off period-cleaning images from builder host	2025-07-08 16:35:22 +03:00
Nadezhda Fedorova	ddb984edf4	fix(build.py): add console parameter to set different push registry (overwrite-registry)	2025-06-26 15:41:18 +03:00
Nadezhda Fedorova	4d4b5f74cf	fix(build.py): add cleaning images during building process to fix workflow's error 'no space left on device'	2025-06-26 15:39:09 +03:00
				`@ -1 +0,0 @@`
				`ls -a /usr/lib/kafka/bin/ \| grep kafka && /usr/lib/kafka/bin/kafka-topics.sh --version`
				`@ -1 +0,0 @@`
				`redis-cli --version && redis-server --version`