add/fix description to some images

refactor test script
add second search of packages version, if package is older than branch
2024-12-16 15:35:24 +03:00 · 2024-12-16 15:35:10 +03:00 · 2024-12-16 15:35:10 +03:00 · 2024-12-16 15:35:10 +03:00 · 2024-12-16 15:35:10 +03:00 · 2024-12-10 16:40:43 +03:00
97 changed files with 465 additions and 369 deletions
--- a/.gitea/workflows/testscript
+++ b/.gitea/workflows/testscript
@ -6,41 +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-true' ]]; then
-      command="podman run --rm $3/$imgpath \"true\""
+    if [[ "$IM" == distroless-toybox ]]; then
+      command="podman run --rm $url/$imgpath toysh -c true"
    fi
-    if [[ $IM == 'distroless-gotop' ]]; then 
-      command="podman run --rm $3/$imgpath \"--version\""
+    if [ "$IM" = distroless-true ]; then
+      command="podman run --rm $url/$imgpath \"true\""
+    fi
+    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
@ -49,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 
@ -60,7 +65,7 @@ do
 done

 echo "$errors"
-if [[ $errors != '' ]]
+if [ -n "$errors" ]
  then haserr=true 
 fi
 echo "ERR=$haserr" > haserr.log
--- a/.gitea/workflows/wf_full_sis.yaml
+++ b/.gitea/workflows/wf_full_sis.yaml
@ -2,7 +2,7 @@ name: Full building alt images
 on:
  push:
    tags:
-      - 'sisyphus_*'
+      - '*_*'

 jobs:
  build-process:
@ -25,6 +25,13 @@ jobs:
        env:
          GU: ${{ gitea.server_url }}
          GR: ${{ gitea.repository }}
+      - name: Set repo for c10f2 (Temporary)
+        if: ${{ contains(github.ref_name, 'c10f2') }}
+        run: |
+          echo "event tag=${{ github.ref_name }}" 
+          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
+          echo "cat /etc/hosts"
+          cat /etc/hosts
      - name: Update apt
        uses: actions/init-alt-env@v1
      - name: Install requires
@ -54,10 +61,11 @@ jobs:
      - name: Run building script
        id: build-script
        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64 loong64"          
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --overwrite-organization $ORG-$BR --package-versions {\"k8s/kube-apiserver\":\"1.31\",\"k8s/kube-scheduler\":\"1.31\",\"k8s/kube-controller-manager\":\"1.31\",\"k8s/kube-proxy\":\"1.31\",\"k8s/coredns\":\"1.11.3\"}"; fi
-          echo "build.py $build_args"
-          ${{ gitea.workspace }}/build.py $build_args
+          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"
+          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
+          if [[ "$ORG" == "k8s" ]]; then build_args="$build_args --overwrite-organization $ORG-$BR --package-versions {\"k8s/kube-apiserver\":\"1.31\",\"k8s/kube-scheduler\":\"1.31\",\"k8s/kube-controller-manager\":\"1.31\",\"k8s/kube-proxy\":\"1.31\",\"k8s/coredns\":\"1.11.3\",\"k8s/kubelet\":\"1.31\"}"; fi
+          echo "build.py $build_args $arches"
+          ${{ gitea.workspace }}/build.py $build_args $arches
        env:
          ORG: ${{ env.ORG }}
          BR: ${{ env.BRANCH }}
--- a/.gitea/workflows/wf_full_p10.yaml
+++ b/.gitea/workflows/wf_full_p10.yaml
@ -1,133 +0,0 @@
-name: Full building alt images
-on:
-  push:
-    tags:
-      - '*10*_*'
-
-jobs:
-  build-process:
-    runs-on: alt-p10
-    outputs:
-      branch: ${{ env.BRANCH }}
-      org: ${{ env.ORG }}
-      url: ${{ env.URL }}
-      repo: ${{ env.REPO }}
-      buildres: ${{ steps.build-script.outcome }}
-    steps:
-      - name: Check workspace
-        run: |
-          repourl=$(echo $GU | cut -d '/' -f 3)
-          echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
-          reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
-        env:
-          GU: ${{ gitea.server_url }}
-          GR: ${{ gitea.repository }}
-      - name: Set repo for c10f2 (Temporary)
-        if: ${{ contains(github.ref_name, 'c10f2') }}
-        run: |
-          echo "event tag=${{ github.ref_name }}" 
-          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
-          echo "cat /etc/hosts"
-          cat /etc/hosts
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          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-ppc 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-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch         
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Parse target branch and tag from events context, save to env                                
-        env:
-          EV: ${{ toJson(gitea.event) }}                                         
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}                              
-          echo "ORG=$org"
-      - name: Login podman gitea
-        run: |
-          echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
-        env:
-          P_USER: ${{ secrets.PODMAN_USER }}
-          P_PASS: ${{ secrets.PODMAN_PASS }}
-      - name: Run building script
-        id: build-script
-        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64"          
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
-          echo "build.py $build_args"
-          ${{ gitea.workspace }}/build.py $build_args
-        env:
-          ORG: ${{ env.ORG }}
-          BR: ${{ env.BRANCH }}
-        continue-on-error: true
-      - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
-          issueid=1
-          body="Building images finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-      - name: Delete event tag
-        run: |
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"                    
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          EV: ${{ toJson(gitea.event) }}
-  test-process:
-    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-p10
-    steps:
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-      - name: Check out current repo
-        uses: https://gitea.com/actions/checkout@v4
-      - name: Test
-        id: test-script
-        continue-on-error: true
-        run: |
-          $WS/.gitea/workflows/testscript $BR $ORG $URL $REPO $WS
-          cat haserr.log >> ${GITHUB_ENV}
-          echo "test process finished"
-        env:
-          BR: ${{ needs.build-process.outputs.branch }}
-          ORG: ${{ needs.build-process.outputs.org }}
-          URL: ${{ needs.build-process.outputs.url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-          WS: ${{ gitea.workspace }}
-      - name: Send notification if test crashed
-        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
-        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing images finish with some errors. $errors"
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
--- a/.gitea/workflows/wf_full_p11.yaml
+++ b/.gitea/workflows/wf_full_p11.yaml
@ -1,133 +0,0 @@
-name: Full building alt images
-on:
-  push:
-    tags:
-      - 'p11_*'
-
-jobs:
-  build-process:
-    runs-on: alt-sisyphus
-    outputs:
-      branch: ${{ env.BRANCH }}
-      org: ${{ env.ORG }}
-      url: ${{ env.URL }}
-      repo: ${{ env.REPO }}
-      buildres: ${{ steps.build-script.outcome }}
-    steps:
-      - name: Check workspace
-        run: |
-          repourl=$(echo $GU | cut -d '/' -f 3)
-          echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo $repourl
-          reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo $reponame
-        env:
-          GU: ${{ gitea.server_url }}
-          GR: ${{ gitea.repository }}
-      - name: Set repo for p11 (Temporary)
-        if: ${{ contains(github.ref_name, 'p11') }}
-        run: |
-          echo "event tag=${{ github.ref_name }}" 
-          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
-          echo "cat /etc/hosts"
-          cat /etc/hosts 
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          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-ppc 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-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Parse target branch and tag from events context, save to env                                
-        env:
-          EV: ${{ toJson(gitea.event) }}                                         
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}                              
-          echo "ORG=$org"
-      - name: Login podman gitea
-        run: |
-          echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
-        env:
-          P_USER: ${{ secrets.PODMAN_USER }}
-          P_PASS: ${{ secrets.PODMAN_PASS }}
-      - name: Run building script
-        id: build-script
-        run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel --arches amd64 386 arm64"          
-          if [[ $ORG == 'k8s' ]]; then build_args="$build_args --tags tags.toml --overwrite-organization $ORG-$BR --skip-images k8s/kube-apiserver k8s/kube-controller-manager k8s/kube-proxy k8s/kube-scheduler"; fi
-          echo "build.py $build_args"
-          ${{ gitea.workspace }}/build.py $build_args
-        env:
-          ORG: ${{ env.ORG }}
-          BR: ${{ env.BRANCH }}
-        continue-on-error: true
-      - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
-          issueid=1
-          body="Building images finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-      - name: Delete event tag
-        run: |
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"                    
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          EV: ${{ toJson(gitea.event) }}
-  test-process:
-    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-sisyphus
-    steps:
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
-      - name: Check out current repo
-        uses: https://gitea.com/actions/checkout@v4
-      - name: Test
-        id: test-script
-        continue-on-error: true
-        run: |
-          $WS/.gitea/workflows/testscript $BR $ORG $URL $REPO $WS
-          cat haserr.log >> ${GITHUB_ENV}
-          echo "test process finished"
-        env:
-          BR: ${{ needs.build-process.outputs.branch }}
-          ORG: ${{ needs.build-process.outputs.org }}
-          URL: ${{ needs.build-process.outputs.url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-          WS: ${{ gitea.workspace }}
-      - name: Send notification if test crashed
-        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
-        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing images finish with some errors. $errors"
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
--- a/.gitea/workflows/wf_single.yaml
+++ b/.gitea/workflows/wf_single.yaml
@ -6,7 +6,7 @@ on:

 jobs:
  build-process:
-    runs-on: alt-latest
+    runs-on: alt-sisyphus
    outputs:
      branch: ${{ env.BRANCH }}
      image: ${{ env.IMAGE }}
@ -79,8 +79,8 @@ jobs:
        id: build-script
        run: |
          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--overwrite-organization $ORG-$BR --package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
-          if [[ "$BR" = "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
-          echo "build.py -i $IM -b $BR"
+          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
+          echo "build.py -i $IM -b $BR $arches $k8sarg"
          ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches $k8sarg 
        env:
          IM: ${{ env.IMAGE }}
@ -115,7 +115,7 @@ jobs:
  test-process:
    needs: build-process
    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-latest
+    runs-on: alt-sisyphus
    steps:
      - name: Update apt
        uses: https://gitea.basealt.ru/actions/init-alt-env@v1
--- a/README.md
+++ b/README.md
@ -88,6 +88,8 @@ source_packages:
 On x86_64 machine using p10 branch you need:
 - `python3-module-tomli`
 - `python3-module-jinja2`
+- `python3-module-yaml`
+- `python3-module-requests`
 - `qemu-user-static-binfmt-aarch64` to build for arm64 architecture
 - `qemu-user-static-binfmt-arm` to build for arm architecture
 - `qemu-user-static-binfmt-ppc` to build for ppc64le architecture
--- a/build.py
+++ b/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


@ -192,6 +217,10 @@ class Distroless:
        elif value := dd.get("workingdir"):
            self.config_options.append(f"--workingdir={value}")

+        if labels := dd.get("label"):
+            for k, v in labels.items():
+                self.config_options.append(f"--label={k}={v}")
+
    def render_arch_branch(self, arch, branch):
        def if_arches(arches, value, default=""):
            if arch in arches or not arches:
@ -238,9 +267,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 +298,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 +345,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 +419,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 +428,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 +460,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)
--- a/images-info.toml
+++ b/images-info.toml
@ -1,14 +1,11 @@
 ["alt/buildpack-deps"]
 skip-branches = [ "p9" ]

+["alt/distroless-toybox"]
+skip-branches = [ "p10" ]
+
 ["alt/openjdk21"]
 skip-arches = [ "386" ]

 ["alt/ansible"]
-skip-branches = [ "c10f2", "c10f1", "p10" ]
-
-["alt/distroless-base"]
-skip-arches = [ "loong64" ]
-
-["alt/distroless-gotop"]
-skip-arches = [ "loong64" ]
+skip-branches = [ "c10f2", "c10f1", "p10" ]
--- a/org/alt/ansible/Dockerfile.template
+++ b/org/alt/ansible/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/node:{{ branch }}
+FROM {{ registry }}{{ branch }}/node:latest

 MAINTAINER alt-cloud

--- a/org/alt/ansible/info.yaml
+++ b/org/alt/ansible/info.yaml
@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - ansible-core
+  - ansible-vim
+  - ansible-lint
+...
--- a/org/alt/apache2/Dockerfile.template
+++ b/org/alt/apache2/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/apache2/info.yaml
+++ b/org/alt/apache2/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - apache2
+...
--- a/org/alt/base/Dockerfile.template
+++ b/org/alt/base/Dockerfile.template
@ -1,7 +1,12 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

+LABEL org.opencontainers.image.title="base"
+LABEL org.opencontainers.image.description="Base image with localization and timezone packages"
+LABEL org.opencontainers.image.licenses="GPLv2"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
 {{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}

 CMD ["bash"]
--- a/org/alt/base/info.yaml
+++ b/org/alt/base/info.yaml
@ -0,0 +1,7 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - glibc
+  - tzdata
+...
--- a/org/alt/buildpack-deps-curl/Dockerfile.template
+++ b/org/alt/buildpack-deps-curl/Dockerfile.template
@ -1,8 +1,9 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

 LABEL org.opencontainers.image.title="buildpack-deps-curl"
+LABEL org.opencontainers.image.description = "Transfer data environment"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

--- a/org/alt/buildpack-deps-curl/info.yaml
+++ b/org/alt/buildpack-deps-curl/info.yaml
@ -0,0 +1,9 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - ca-certificates
+  - curl
+  - gnupg
+  - wget
+...
--- a/org/alt/buildpack-deps-scm/Dockerfile.template
+++ b/org/alt/buildpack-deps-scm/Dockerfile.template
@ -1,9 +1,10 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps-curl:{{ branch }}
+FROM {{ registry }}{{ branch }}/buildpack-deps-curl:latest

 MAINTAINER alt-cloud

 LABEL org.opencontainers.image.title="buildpack-deps-scm"
 LABEL org.opencontainers.image.licenses="GPLv2"
+LABEL org.opencontainers.image.description = "Software configuration management environment"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

 {{ install_packages(
--- a/org/alt/buildpack-deps-scm/info.yaml
+++ b/org/alt/buildpack-deps-scm/info.yaml
@ -0,0 +1,10 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - git
+  - mercurial
+  - openssh
+  - procps
+  - subversion
+...
--- a/org/alt/buildpack-deps/Dockerfile.template
+++ b/org/alt/buildpack-deps/Dockerfile.template
@ -1,8 +1,9 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps-scm:{{ branch }}
+FROM {{ registry }}{{ branch }}/buildpack-deps-scm:latest

 MAINTAINER alt-cloud

 LABEL org.opencontainers.image.title="buildpack-deps"
+LABEL org.opencontainers.image.description = "Projects building environment"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

--- a/org/alt/buildpack-deps/info.yaml
+++ b/org/alt/buildpack-deps/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - gcc-defaults
+...
--- a/org/alt/devel/Dockerfile.template
+++ b/org/alt/devel/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud

--- a/org/alt/devel/info.yaml
+++ b/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
+...
--- a/org/alt/distroless-base/distroless.toml
+++ b/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")}}',
@ -19,3 +19,4 @@ packages = [
    "zlib",
 ]
 timezone = "Europe/Moscow"
+label = {"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/alt/distroless-base/info.yaml
+++ b/org/alt/distroless-base/info.yaml
@ -0,0 +1,9 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - glibc
+  - tzdata
+  - zlib
+  - libselinux
+...
--- a/org/alt/distroless-builder/Dockerfile.template
+++ b/org/alt/distroless-builder/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/distroless-builder/info.yaml
+++ b/org/alt/distroless-builder/info.yaml
@ -0,0 +1,7 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - glibc
+  - apt-repo
+...
--- a/org/alt/distroless-devel/distroless.toml
+++ b/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",
@ -37,3 +37,4 @@ packages = [
    "vim-console",
 ]
 cmd = ["/bin/bash"]
+label = {"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/alt/distroless-devel/info.yaml
+++ b/org/alt/distroless-devel/info.yaml
@ -0,0 +1,10 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - coreutils
+  - findutils
+  - glibc
+  - iproute2
+  - vim
+...
--- a/org/alt/distroless-gotop/distroless.toml
+++ b/org/alt/distroless-gotop/distroless.toml
@ -1,3 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-base:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-base:latest"
 full-files = ["/usr/bin/gotop"]
 entrypoint = ["/usr/bin/gotop"]
+label = {"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/alt/distroless-gotop/info.yaml
+++ b/org/alt/distroless-gotop/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - gotop
+...
--- a/org/alt/distroless-static/distroless.toml
+++ b/org/alt/distroless-static/distroless.toml
@ -2,3 +2,4 @@ from = "scratch"
 file-lists = ["static.list"]
 user = "nonroot"
 workdir = "/home/nonroot"
+label = {"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/alt/distroless-static/info.yaml
+++ b/org/alt/distroless-static/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - distroless-static
+...
--- a/org/alt/distroless-toybox/README.md
+++ b/org/alt/distroless-toybox/README.md
@ -0,0 +1,11 @@
+ALT distroless-toybox image
+===========================
+
+This is distroless image with toybox binary. It can be used for debugging
+containers as toybox provides a lot of utils.
+
+To launch a shell in the container:
+`docker run --rm -it registry.altlinux.org/alt/distroless-toybox`
+
+To get system inforamtion:
+`docker run --rm -it registry.altlinux.org/alt/distroless-toybox uname -a`
--- a/org/alt/distroless-toybox/distroless.toml
+++ b/org/alt/distroless-toybox/distroless.toml
@ -0,0 +1,7 @@
+from = "{{ registry }}{{ branch }}/distroless-static:latest"
+
+builder-install-packages = ["toybox"]
+files = ["/bin/toybox"]
+entrypoint = ["/bin/toybox"]
+cmd = ["sh"]
+label = {"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/alt/distroless-toybox/info.yaml
+++ b/org/alt/distroless-toybox/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - toybox
+...
--- a/org/alt/distroless-true/distroless.toml
+++ b/org/alt/distroless-true/distroless.toml
@ -1,3 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
+from = "{{ registry }}{{ branch }}/distroless-static:latest"
 files = ["/bin/true"]
 cmd = ["/bin/true"]
+label = {"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/alt/distroless-true/info.yaml
+++ b/org/alt/distroless-true/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: false
+version_template: "{{ version }}"
+source_packages:
+  - distroless-true
+...
--- a/org/alt/etcd/Dockerfile.template
+++ b/org/alt/etcd/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/etcd/info.yaml
+++ b/org/alt/etcd/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - etcd
+...
--- a/org/alt/gitea/Dockerfile.template
+++ b/org/alt/gitea/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/gitea/info.yaml
+++ b/org/alt/gitea/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - gitea
+...
--- a/org/alt/golang/Dockerfile.template
+++ b/org/alt/golang/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud

--- a/org/alt/golang/info.yaml
+++ b/org/alt/golang/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - golang
+...
--- a/org/alt/grafana/Dockerfile.template
+++ b/org/alt/grafana/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/grafana/info.yaml
+++ b/org/alt/grafana/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - grafana
+...
--- a/org/alt/loki/Dockerfile.template
+++ b/org/alt/loki/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/loki/info.yaml
+++ b/org/alt/loki/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - loki
+...
--- a/org/alt/nginx/Dockerfile.template
+++ b/org/alt/nginx/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/nginx/info.yaml
+++ b/org/alt/nginx/info.yaml
@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - nginx
+  - apache2
+  - tzdata
+...
--- a/org/alt/node/Dockerfile.template
+++ b/org/alt/node/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps:{{ branch }}
+FROM {{ registry }}{{ branch }}/buildpack-deps:latest

 MAINTAINER alt-cloud

--- a/org/alt/node/info.yaml
+++ b/org/alt/node/info.yaml
@ -0,0 +1,7 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - node
+  - yarn
+...
--- a/org/alt/openjdk21/Dockerfile.template
+++ b/org/alt/openjdk21/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud

--- a/org/alt/openjdk21/info.yaml
+++ b/org/alt/openjdk21/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - java-21-openjdk
+...
--- a/org/alt/php/Dockerfile.template
+++ b/org/alt/php/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud

--- a/org/alt/php/info.yaml
+++ b/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 %}
+...
--- a/org/alt/postgresql/Dockerfile.template
+++ b/org/alt/postgresql/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud
 
--- a/org/alt/postgresql/info.yaml
+++ b/org/alt/postgresql/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - postgresql16
+...
--- a/org/alt/prometheus-alertmanager/Dockerfile.template
+++ b/org/alt/prometheus-alertmanager/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/prometheus-alertmanager/info.yaml
+++ b/org/alt/prometheus-alertmanager/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - prometheus-alertmanager
+...
--- a/org/alt/prometheus-node_exporter/Dockerfile.template
+++ b/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

--- a/org/alt/prometheus-node_exporter/info.yaml
+++ b/org/alt/prometheus-node_exporter/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - prometheus-node_exporter
+...
--- a/org/alt/prometheus/Dockerfile.template
+++ b/org/alt/prometheus/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/prometheus/info.yaml
+++ b/org/alt/prometheus/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - prometheus
+...
--- a/org/alt/python/Dockerfile.template
+++ b/org/alt/python/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud

--- a/org/alt/python/info.yaml
+++ b/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
+...
--- a/org/alt/python2/Dockerfile.template
+++ b/org/alt/python2/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud
 
--- a/org/alt/python2/info.yaml
+++ b/org/alt/python2/info.yaml
@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - python-module-setuptools
+  - python-dev
+  - gcc-defaults
+...
--- a/org/alt/rabbitmq/Dockerfile.template
+++ b/org/alt/rabbitmq/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud
 
--- a/org/alt/rabbitmq/info.yaml
+++ b/org/alt/rabbitmq/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - rabbitmq-server
+...
--- a/org/alt/registry/Dockerfile.template
+++ b/org/alt/registry/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/registry/info.yaml
+++ b/org/alt/registry/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - docker-registry
+...
--- a/org/alt/ruby/Dockerfile.template
+++ b/org/alt/ruby/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/ruby/info.yaml
+++ b/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 %}
+...
--- a/org/alt/systemd/Dockerfile.template
+++ b/org/alt/systemd/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest

 MAINTAINER alt-cloud

--- a/org/alt/systemd/info.yaml
+++ b/org/alt/systemd/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - systemd
+...
--- a/org/alt/trivy/Dockerfile.template
+++ b/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" ]
--- a/org/alt/trivy/info.yaml
+++ b/org/alt/trivy/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - trivy
+...
--- a/org/alt/unit/Dockerfile.template
+++ b/org/alt/unit/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/unit/info.yaml
+++ b/org/alt/unit/info.yaml
@ -0,0 +1,8 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - unit
+  - curl
+  - tzdata
+...
--- a/org/alt/zot/Dockerfile.template
+++ b/org/alt/zot/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/alt/zot/info.yaml
+++ b/org/alt/zot/info.yaml
@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - zot
+...
--- a/org/k8s/cert-manager-acmesolver/Dockerfile.template
+++ b/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

--- a/org/k8s/cert-manager-cainjector/Dockerfile.template
+++ b/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

--- a/org/k8s/cert-manager-controller/Dockerfile.template
+++ b/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

--- a/org/k8s/cert-manager-startupapicheck/Dockerfile.template
+++ b/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

--- a/org/k8s/cert-manager-webhook/Dockerfile.template
+++ b/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

--- a/org/k8s/coredns/Dockerfile.template
+++ b/org/k8s/coredns/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/k8s/etcd/Dockerfile.template
+++ b/org/k8s/etcd/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/k8s/flannel-cni-plugin/Dockerfile.template
+++ b/org/k8s/flannel-cni-plugin/Dockerfile.template
@ -1,12 +1,12 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

-LABEL org.opencontainers.image.title="flannel-cni-plugin"
-LABEL org.opencontainers.image.description="CNI network plugin that is powered by flannel"
-LABEL org.opencontainers.image.source="https://github.com/flannel-io/cni-plugin"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
+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="ALT Linux Team"

 {{ install_packages("cni-plugin-flannel") }}

--- a/org/k8s/flannel/Dockerfile.template
+++ b/org/k8s/flannel/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/k8s/kube-apiserver/Dockerfile.template
+++ b/org/k8s/kube-apiserver/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/k8s/kube-controller-manager/Dockerfile.template
+++ b/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

--- a/org/k8s/kube-proxy/Dockerfile.template
+++ b/org/k8s/kube-proxy/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/k8s/kube-scheduler/Dockerfile.template
+++ b/org/k8s/kube-scheduler/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

--- a/org/k8s/kubelet/Dockerfile.template
+++ b/org/k8s/kubelet/Dockerfile.template
@ -0,0 +1,17 @@
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
+
+MAINTAINER alt-cloud
+
+ARG PKG_VERSION
+
+{{ install_packages("ca-certificates", "ethtool", "socat", "kubernetes${PKG_VERSION}-kubelet") }}
+
+RUN ln -s /usr/bin/kubelet /usr/local/bin/kubelet
+
+ENTRYPOINT ["/usr/bin/kubelet"]
+
+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="ALT Linux Team" \
--- a/org/k8s/pause/Dockerfile.template
+++ b/org/k8s/pause/Dockerfile.template
@ -1,4 +1,11 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest as installer
+
+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="ALT Linux Team"

 {{ install_packages("kubernetes-pause") }}

@ -6,4 +13,4 @@ FROM scratch

 COPY --from=installer /usr/bin/kubernetes-pause /pause

-CMD ["/pause"]
+ENTRYPOINT ["/pause"]
--- a/org/k8s/trivy-node-collector/Dockerfile.template
+++ b/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
Author	SHA1	Message	Date
Nadezhda Fedorova	6e6d876b83	add/fix description to some images	2024-12-16 15:35:24 +03:00
Nadezhda Fedorova	ff20da92a8	refactor test script	2024-12-16 15:35:10 +03:00
Nadezhda Fedorova	78daf7d9bb	add second search of packages version, if package is older than branch	2024-12-16 15:35:10 +03:00
Nadezhda Fedorova	cb5f3ec98f	go to new struct in docker templates and build script	2024-12-16 15:35:10 +03:00
Nadezhda Fedorova	3cb1114358	add info for new repo struct to alt org images	2024-12-16 15:35:10 +03:00
Alexander Stepchenko	faaa41da4d	replace CMD with ENTRYPOINT in pause image	2024-12-10 16:40:43 +03:00
Надежда Федорова	ea8aa8f897	Обновить images-info.toml	2024-11-13 12:10:38 +03:00
Mikhail Gordeev	05cf05c29d	add distroless-toybox image	2024-11-13 12:07:24 +03:00
Надежда Федорова	fca809825f	Обновить images-info.toml All checks were successful Building alt images / build-process (push) Successful in 3m43s Details Building alt images / test-process (push) Has been skipped Details	2024-11-12 10:49:01 +03:00
Nadezhda Fedorova	48c571ed65	add scripts dependence to README.md All checks were successful Building alt images / build-process (push) Successful in 4m19s Details Building alt images / test-process (push) Successful in 1m13s Details Full building alt images / build-process (push) Successful in 46m36s Details Full building alt images / test-process (push) Has been skipped Details	2024-11-11 19:07:17 +03:00
Nadezhda Fedorova	50e125d59d	run all wf wf with alt-sisyphus	2024-11-11 19:07:05 +03:00
Nadezhda Fedorova	4da3ba20e1	fix building errors All checks were successful Building alt images / build-process (push) Successful in 2m6s Details Building alt images / test-process (push) Has been skipped Details	2024-11-11 18:29:43 +03:00
Alexander Stepchenko	abc15fee40	add kubelet Dockerfile.template All checks were successful Full building alt images / build-process (push) Successful in 41m9s Details Full building alt images / test-process (push) Has been skipped Details	2024-11-11 18:06:20 +03:00