refactor test script

.gitea/workflows/testscript

@@ -6,44 +6,46 @@
 #$4 - ${{ needs.build-process.outputs.repo }}
 #$5 - ${{ gitea.workspace }}
 
+branch=${1:-"sisyphus"}
+org=${2:-"alt"}
+url=${3:-"gitea.basealt.ru"}
+repo=${4:-"alt"}
+wosp=${5:-"."}
+
 errors=''
 haserr=false
-for IM in $(ls $5/org/$2/ | xargs)
+for IM in $(ls $wosp/org/$org/ | xargs)
 do 
   echo "image=$IM"
-  if test -f $5/org/$2/$IM/test
+  if test -f $wosp/org/$org/$IM/test
   then 
-    test=$(cat $5/org/$2/$IM/test)
+    test=$(cat $wosp/org/$org/$IM/test)
   else test=''
   fi 
 
   echo "test script=$test"
-  imgpath="$2/$IM:$1"
-
-  if [[ $2 == 'k8s' ]]
-    then imgpath="$2-$1/$IM:latest"
-  fi
+  imgpath="$repo/$branch/$IM:latest"
 
   entrypoint='/bin/sh'
 
   command="echo empty_command"
-  if [[ $test != '' ]]; then
-    command="podman run --rm --entrypoint=\"$entrypoint\" $3/$imgpath -c \"$test\""
+  if [ -n "$test" ]; then
+    command="podman run --rm --entrypoint=\"$entrypoint\" $url/$imgpath -c \"$test\""
   else
-    if [[ $IM == 'distroless-toybox' ]]; then
-      command="podman run --rm $3/$imgpath toysh -c true"
+    if [[ "$IM" == distroless-toybox ]]; then
+      command="podman run --rm $url/$imgpath toysh -c true"
     fi
-    if [[ $IM == 'distroless-true' ]]; then
-      command="podman run --rm $3/$imgpath \"true\""
+    if [ "$IM" = distroless-true ]; then
+      command="podman run --rm $url/$imgpath \"true\""
     fi
-    if [[ $IM == 'distroless-gotop' ]]; then 
-      command="podman run --rm $3/$imgpath \"--version\""
+    if [ "$IM" = distroless-gotop ]; then 
+      command="podman run --rm $url/$imgpath \"--version\""
     fi 
-    if [[ $IM == 'flannel-cni-plugin' ]]; then
-      command="podman run --rm $3/$imgpath \"/flannel\""
+    if [ "$IM" = flannel-cni-plugin ]; then
+      command="podman run --rm $url/$imgpath \"/flannel\""
     fi
-    if [[ $IM == 'pause' ]]; then 
-      command="podman run --rm $3/$imgpath \"/pause\" \"-v\""
+    if [ "$IM" == pause ]; then 
+      command="podman run --rm $url/$imgpath \"/pause\" \"-v\""
     fi 
   fi
   echo $command
@@ -52,9 +54,9 @@ do
   echo "podman rmi --all"
   podman rmi --all
 
-  if [ "$haserr" = true ]
+  if [ "$haserr" ]
   then 
-    if [[ $(cat $IM.log) != '' ]]
+    if [[ -n $(cat $IM.log) ]]
     then errors="TEST ERROR OF IMAGE $IM: $(cat $IM.log); $errors"
     else errors="TEST ERROR OF IMAGE $IM: test returned empty error, but exit status was nozero; $errors"
     fi 
@@ -63,7 +65,7 @@ do
 done
 
 echo "$errors"
-if [[ $errors != '' ]]
+if [ -n "$errors" ]
   then haserr=true 
 fi
 echo "ERR=$haserr" > haserr.log

build.py

@@ -6,6 +6,7 @@ import json
 import re
 import subprocess
 import textwrap
+from datetime import datetime
 from dataclasses import dataclass
 from graphlib import TopologicalSorter
 from pathlib import Path
@@ -91,6 +92,19 @@ def api_get_source_package_version(branch: str, package_name: str) -> str:
     response = requests.get(api_url, params)
     if response.status_code != 200:
         print(response)
+        api_url = "https://rdb.altlinux.org/api/site/package_versions"
+        params = {"arch": "x86_64", "package_type": "source", "name": package_name}
+        response = requests.get(api_url, params)
+        if response.status_code != 200:
+            print(response)
+            raise RuntimeError(
+                    f"failed to retrieve source package version: source package {package_name!r}, branch {branch!r} "
+            )
+        result = response.json()
+        for v in result["versions"]:
+            if v["branch"] == branch:
+                return v["version"]
+
         raise RuntimeError(
             f"failed to retrieve source package version: source package {package_name!r}, branch {branch!r} "
         )
@@ -110,7 +124,12 @@ class Tags:
 
     def tags(self, branch: str, image: Image):
         if self._tags is None:
-            if image.is_versioned and image.source_packages:
+            if image.is_versioned is None:
+                tags = [branch]
+                if branch == self._latest:
+                    tags.append("latest")
+
+            elif image.is_versioned and image.source_packages:
                 package_name = image.source_packages[0]
 
                 if re.search("{%.*%}", package_name):
@@ -144,12 +163,18 @@ class Tags:
                     )
 
                 tags = [version]
+                tags.append("latest")
             else:
-                tags = [branch]
+                version = datetime.now().strftime('%Y%m%d')
+                if image.version_template is not None:
+                    version = (
+                        Template(image.version_template).render(version=version).strip()
+                    )
+                tags = [version]
+                tags.append("latest")
         else:
             tags = self._tags[image.canonical_name][branch].copy()
-        if branch == self._latest:
-            tags.append("latest")
+
         return tags
 
 
@@ -238,9 +263,10 @@ class DockerBuilder:
     def make_image_re(self):
         registry = r"(?P<registry>[\w.:]+)"
         organization = r"(?P<organization>\w+)"
+        branch = r"(?P<branch>\w+)"
         name = r"(?P<name>[-.\w]+)"
         tag = r"(?P<tag>[\w.]+)"
-        return rf"(:?{registry}/)?(:?{organization}/)?{name}(:?:{tag})?"
+        return rf"(:?{registry}/)?(:?{organization}/)?(:?{branch}/)?{name}(:?:{tag})?"
 
     def make_dockerfile_from_re(self):
         image_re = self.make_image_re()
@@ -268,7 +294,7 @@ class DockerBuilder:
         if overwrite_organization:
             self.overwrite_organization = overwrite_organization
         else:
-            self.overwrite_organization = organization
+            self.overwrite_organization = branch
         self.latest = latest
         self.dry_run = dry_run
         self.images_info = images_info
@@ -315,7 +341,7 @@ class DockerBuilder:
     ) -> str:
         if self.registry:
             registry = self.registry.rstrip("/") + "/"
-            alt_image = "alt/alt"
+            alt_image = "alt"
         else:
             registry = ""
             alt_image = "alt"
@@ -389,7 +415,7 @@ class DockerBuilder:
                     from_image = match.groupdict()
                     if from_image["name"] != "scratch":
                         requires.add(
-                            f"{from_image['organization']}/{from_image['name']}"
+                            f"{self.organization}/{from_image['name']}"
                         )
         elif distrolessfile.exists():
             requires.add("alt/distroless-builder")
@@ -398,7 +424,7 @@ class DockerBuilder:
             if match := re.match(self.image_re, from_):
                 from_image = match.groupdict()
                 if from_image["name"] != "scratch":
-                    requires.add(f"{from_image['organization']}/{from_image['name']}")
+                    requires.add(f"{self.organization}/{from_image['name']}")
 
         return (canonical_name, requires)
 
@@ -430,7 +456,7 @@ class DockerBuilder:
     def distroless_build(self, image: Image, arches):
         def distroless_build_arch(arch, manifest):
             distroless_builder = self.render_full_tag(
-                Image("alt/distroless-builder"), self.branch
+                Image("alt/distroless-builder"), "latest"
             )
             distroless = self.distrolesses[image.canonical_name]
             distroless.render_arch_branch(arch, self.branch)

org/alt/ansible/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/node:{{ branch }}
+FROM {{ registry }}{{ branch }}/node:latest
 
 MAINTAINER alt-cloud
 

org/alt/ansible/info.yaml

@@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - ansible-core
+  - ansible-vim
+  - ansible-lint
+...

org/alt/apache2/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/apache2/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - apache2
+...

org/alt/base/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/base/info.yaml

@@ -0,0 +1,7 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - glibc
+  - tzdata
+...

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/buildpack-deps-curl/info.yaml

@@ -0,0 +1,9 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - ca-certificates
+  - curl
+  - gnupg
+  - wget
+...

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps-curl:{{ branch }}
+FROM {{ registry }}{{ branch }}/buildpack-deps-curl:latest
 
 MAINTAINER alt-cloud
 

org/alt/buildpack-deps-scm/info.yaml

@@ -0,0 +1,10 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - git
+  - mercurial
+  - openssh
+  - procps
+  - subversion
+...

org/alt/buildpack-deps/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps-scm:{{ branch }}
+FROM {{ registry }}{{ branch }}/buildpack-deps-scm:latest
 
 MAINTAINER alt-cloud
 

org/alt/buildpack-deps/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - gcc-defaults
+...

org/alt/devel/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 

org/alt/devel/info.yaml

@@ -0,0 +1,17 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - gcc-defaults
+  - vim
+  - gdb
+  - git
+  - iproute2
+  - iputils
+  - wget
+  - curl
+  - lsof
+  - ripgrep
+  - zsh
+  - make
+...

org/alt/distroless-base/distroless.toml

@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-static:latest"
 builder-install-packages = [
     "glibc-core",
     '{{if_branches(["p10"], "glibc-nss")}}',

org/alt/distroless-base/info.yaml

@@ -0,0 +1,9 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - glibc
+  - tzdata
+  - zlib
+  - libselinux
+...

org/alt/distroless-builder/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/distroless-builder/info.yaml

@@ -0,0 +1,7 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - glibc
+  - apt-repo
+...

org/alt/distroless-devel/distroless.toml

@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-base:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-base:latest"
 builder-install-packages = [
     "coreutils",
     "findutils",

org/alt/distroless-devel/info.yaml

@@ -0,0 +1,10 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - coreutils
+  - findutils
+  - glibc
+  - iproute2
+  - vim
+...

org/alt/distroless-gotop/distroless.toml

@@ -1,3 +1,3 @@
-from = "{{ registry }}{{ organization }}/distroless-base:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-base:latest"
 full-files = ["/usr/bin/gotop"]
 entrypoint = ["/usr/bin/gotop"]

org/alt/distroless-gotop/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - gotop
+...

org/alt/distroless-static/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - distroless-static
+...

org/alt/distroless-toybox/distroless.toml

@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-static:latest"
 
 builder-install-packages = ["toybox"]
 files = ["/bin/toybox"]

org/alt/distroless-toybox/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - toybox
+...

org/alt/distroless-true/distroless.toml

@@ -1,3 +1,3 @@
-from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-static:latest"
 files = ["/bin/true"]
 cmd = ["/bin/true"]

org/alt/distroless-true/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - distroless-true
+...

org/alt/etcd/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/etcd/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - etcd
+...

org/alt/gitea/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/gitea/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - gitea
+...

org/alt/golang/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 

org/alt/golang/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - golang
+...

org/alt/grafana/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/grafana/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - grafana
+...

org/alt/loki/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/loki/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - loki
+...

org/alt/nginx/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/nginx/info.yaml

@@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - nginx
+  - apache2
+  - tzdata
+...

org/alt/node/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps:{{ branch }}
+FROM {{ registry }}{{ branch }}/buildpack-deps:latest
 
 MAINTAINER alt-cloud
 

org/alt/node/info.yaml

@@ -0,0 +1,7 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - node
+  - yarn
+...

org/alt/openjdk21/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 

org/alt/openjdk21/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - java-21-openjdk
+...

org/alt/php/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 

org/alt/php/info.yaml

@@ -0,0 +1,11 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - >
+    {% if branch in [ "p10", "c10f1", "c10f2"] %}
+    {% raw %}php8.2{% endraw %}
+    {% else %}
+    php8.3
+    {% endif %}
+...

org/alt/postgresql/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
  

org/alt/postgresql/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - postgresql16
+...

org/alt/prometheus-alertmanager/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/prometheus-alertmanager/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - prometheus-alertmanager
+...

org/alt/prometheus-node_exporter/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/prometheus-node_exporter/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - prometheus-node_exporter
+...

org/alt/prometheus/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/prometheus/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - prometheus
+...

org/alt/python/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 

org/alt/python/info.yaml

@@ -0,0 +1,9 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - python3-module-setuptools
+  - python3-dev
+  - python3-module-pip
+  - gcc-defaults
+...

org/alt/python2/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
  

org/alt/python2/info.yaml

@@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - python-module-setuptools
+  - python-dev
+  - gcc-defaults
+...

org/alt/rabbitmq/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
  

org/alt/rabbitmq/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - rabbitmq-server
+...

org/alt/registry/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/registry/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - docker-registry
+...

org/alt/ruby/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/ruby/info.yaml

@@ -0,0 +1,11 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - >
+    {% if branch in ["p10", "c10f2", "c10f1"] %}
+    {% raw %}ruby{% endraw %}
+    {% else %}
+    gem-irb
+    {% endif %}
+...

org/alt/systemd/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 

org/alt/systemd/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - systemd
+...

org/alt/trivy/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -10,4 +10,4 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 {{ install_packages("trivy") }}
 
-ENTRYPOINT [ "trivy" ]
+ENTRYPOINT [ "trivy" ]

org/alt/trivy/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - trivy
+...

org/alt/unit/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/unit/info.yaml

@@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - unit
+  - curl
+  - tzdata
+...

org/alt/zot/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/alt/zot/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - zot
+...

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/coredns/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/etcd/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/flannel/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/kube-apiserver/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/kube-proxy/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/kube-scheduler/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/kubelet/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 

org/k8s/pause/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest as installer
 
 {{ install_packages("kubernetes-pause") }}
 

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

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud