style: remove trailing whitespace

build.py

@@ -244,7 +244,7 @@ class Tags:
                 tags.append("latest")
         else:
             tags = self._tags[image.canonical_name][branch].copy()
-        
+
         return tags
 
 
@@ -529,7 +529,7 @@ 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')
 
@@ -771,18 +771,18 @@ class DockerBuilder:
             f"--platform={platforms}",
             ".",
         ]
-        
+
         if image.annotations != None:
-            build_cmd = [                                                                    
+            build_cmd = [
-                "podman",                                                                      
+                "podman",
-                "build",                                                                       
+                "build",
-                "--rm",                                                                        
+                "--rm",
-                "--force-rm",                                                                  
+                "--force-rm",
-                f"--manifest={manifest}",                                                      
+                f"--manifest={manifest}",
                 f"--platform={platforms}"
             ]
-            for akey, avalue in image.annotations.items():                                                   
+            for akey, avalue in image.annotations.items():
-                build_cmd.append(                                                                
+                build_cmd.append(
                     f"--annotation={akey}={avalue}")
 
             d = datetime.now()
@@ -793,20 +793,20 @@ class DockerBuilder:
                 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

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" ]

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"]

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

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'
-...

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

org/alt/kafka/test

@@ -1 +0,0 @@
-ls -a /usr/lib/kafka/bin/ | grep kafka && /usr/lib/kafka/bin/kafka-topics.sh --version

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" ]

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
-

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'
-...

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()
-

org/alt/redis/test

@@ -1 +0,0 @@
-redis-cli --version && redis-server --version

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