remove shell implementation of image-build

- Get source package version from the public altlinux api.
- Add build options: --dry-run, --push, --skip-build, --latest
- Separate build and push stages of images

.gitea/workflows/k8s_buildscript.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import json
-import subprocess
-
-vers_path = ".gitea/workflows/k8s_vers.json"
-
-def run(args):
-    result = subprocess.run(
-        args,
-        capture_output = True,
-        text = True
-    )
-    if result.stderr is not None:
-        print(result.stderr)
-        return False
-    print(result.stdout)
-    return True
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-    )
-    parser.add_argument(
-        "--branch",
-        help="used to pick the appropriate VM template to clone",
-        choices=["sisyphus", "c10f2", "p10", "p11"],
-        )
-    parser.add_argument(
-        "--other-build-args",
-        help="other build arg as a string",
-        )
-    parser.add_argument(
-        "--workspace",
-        help="workspace, path to builing script",
-        )
-    return parser.parse_args()
-
-def main() -> None:
-    args = parse_args()
-    if args.branch is None or args.branch == "":
-        raise RuntimeError("Empty branch setting. Check your choise --branch.")
-
-    data = {}
-    with open(f"{args.workspace}/{vers_path}", "r") as f:
-        data = json.load(f)
-
-    i = 0
-    for br in data.get("branches"):
-        if br.get("name") == args.branch:
-            break
-        i += 1
-
-    vers_branch = data.get("branches")[i].get("versions")
-    if vers_branch == None :
-        raise RuntimeError(f"Unknown branch: {args.branch!r}. In {vers_path} no k8s-versions list.")
-
-    images_to_rebuild="k8s/kube-apiserver k8s/kube-scheduler k8s/kube-controller-manager k8s/kube-proxy k8s/kubelet k8s/coredns k8s/etcd"
-    for ver in vers_branch:
-        kube_ver = ver.get("kube-version")
-        dns_ver = ver.get("coredns")
-        if kube_ver != None and dns_ver != None:
-            packs_string=f"-b {args.branch} " + "--package-versions '{\"k8s/kube-apiserver\":" + f"\"{kube_ver}\",\"k8s/kube-scheduler\":\"{kube_ver}\",\"k8s/kube-controller-manager\":\"{kube_ver}\",\"k8s/kube-proxy\":\"{kube_ver}\",\"k8s/kubelet\":\"{kube_ver}\",\"k8s/coredns\":\"{dns_ver}\",\"k8s/etcd\":\"{kube_ver}\"" + "}'"
-            if ver.get("latest") != None and ver.get("latest"):
-                packs_string=f"-o k8s --latest {args.branch} "+packs_string
-            else:
-                packs_string=f"-i {images_to_rebuild} "+packs_string
-
-            subprocess.run(f"{args.workspace}/build.py {args.other_build_args} {packs_string}", shell=True)
-            subprocess.run("podman rmi -f --all", shell=True)
-
-if __name__ == "__main__":
-    main()

.gitea/workflows/k8s_vers.json

@@ -1,72 +0,0 @@
-{
-  "branches": [
-    {
-      "name": "p10",
-      "versions": [
-        {
-          "kube-version": "1.27",
-          "coredns": "1.10.1"
-        },
-        {
-          "kube-version": "1.28",
-          "coredns": "1.10.1",
-          "latest": true
-        }
-      ]
-    },
-    {
-      "name": "p11",
-      "versions": [
-        {
-          "kube-version": "1.31",
-          "coredns": "1.11.3"
-	},
-        {
-          "kube-version": "1.32",
-          "coredns": "1.11.3"
-	},
-	{
-	  "kube-version": "1.33",
-          "coredns": "1.33",
-          "latest": true
-	}
-      ]
-    },
-    {
-    	"name": "c10f2",
-	"versions": [
-	{
-          "kube-version": "1.31",
-          "coredns": "1.11.3"        
-	},
-	{
-          "kube-version": "1.32",
-          "coredns": "1.11.3"
-	},
-	{
-          "kube-version": "1.33",
-          "coredns": "1.33",
-          "latest": true
-        }
-      ]
-    },
-    {
-      "name": "sisyphus",
-      "versions": [
-	{
-          "kube-version": "1.31",
-          "coredns": "1.11.3"
-        },
-        {
-          "kube-version": "1.32",
-          "coredns": "1.11.3"
-	},
-	{
-          "kube-version": "1.33",
-          "coredns": "1.33",
-          "latest": true
-        }
-      ]
-    }
-  ]
-}

.gitea/workflows/testscript

@@ -6,46 +6,41 @@
 #$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 $wosp/org/$org/ | xargs)
+for IM in $(ls $5/org/$2/ | xargs)
 do 
   echo "image=$IM"
-  if test -f $wosp/org/$org/$IM/test
+  if test -f $5/org/$2/$IM/test
   then 
-    test=$(cat $wosp/org/$org/$IM/test)
+    test=$(cat $5/org/$2/$IM/test)
   else test=''
   fi 
 
   echo "test script=$test"
-  imgpath="$repo/$branch/$IM:latest"
+  imgpath="$2/$IM:$1"
+
+  if [[ $2 == 'k8s' ]]
+    then imgpath="$2-$1/$IM:latest"
+  fi
 
   entrypoint='/bin/sh'
 
   command="echo empty_command"
-  if [ -n "$test" ]; then
-    command="podman run --rm --entrypoint=\"$entrypoint\" $url/$imgpath -c \"$test\""
+  if [[ $test != '' ]]; then
+    command="podman run --rm --entrypoint=\"$entrypoint\" $3/$imgpath -c \"$test\""
   else
-    if [ "$IM" = distroless-toybox ]; then
-      command="podman run -q --rm $url/$imgpath toysh -c true"
+    if [[ $IM == 'distroless-true' ]]; then
+      command="podman run --rm $3/$imgpath \"true\""
     fi
-    if [ "$IM" = distroless-true ]; then
-      command="podman run -q --rm $url/$imgpath \"true\""
-    fi
-    if [ "$IM" = distroless-gotop ]; then 
-      command="podman run -q --rm $url/$imgpath \"--version\""
+    if [[ $IM == 'distroless-gotop' ]]; then 
+      command="podman run --rm $3/$imgpath \"--version\""
     fi 
-    if [ "$IM" = flannel-cni-plugin ]; then
-      command="podman run -q --rm $url/$imgpath \"/flannel\""
+    if [[ $IM == 'flannel-cni-plugin' ]]; then
+      command="podman run --rm $3/$imgpath \"/flannel\""
     fi
-    if [ "$IM" == pause ]; then 
-      command="podman run -q --rm $url/$imgpath \"/pause\" \"-v\""
+    if [[ $IM == 'pause' ]]; then 
+      command="podman run --rm $3/$imgpath \"/pause\" \"-v\""
     fi 
   fi
   echo $command
@@ -54,18 +49,18 @@ do
   echo "podman rmi --all"
   podman rmi --all
 
-  if [ "$haserr" ]
+  if [ "$haserr" = true ]
   then 
-    if [[ -n $(cat $IM.log) ]]
+    if [[ $(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"
+    else errors="TEST ERROR OF IMAGE $IM: test returned empty error, but exit status was nozero; $errors"
     fi 
   fi 
   haserr=false
 done
 
 echo "$errors"
-if [ -n "$errors" ]
+if [[ $errors != '' ]]
   then haserr=true 
 fi
 echo "ERR=$haserr" > haserr.log

.gitea/workflows/wf_full_p10.yaml

@@ -2,12 +2,11 @@ name: Full building alt images
 on:
   push:
     tags:
-      - '*_*'
-      - '!*_k8s'
+      - '*10*_*'
 
 jobs:
   build-process:
-    runs-on: alt-sisyphus
+    runs-on: alt-p10
     outputs:
       branch: ${{ env.BRANCH }}
       org: ${{ env.ORG }}
@@ -15,14 +14,6 @@ jobs:
       repo: ${{ env.REPO }}
       buildres: ${{ steps.build-script.outcome }}
     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 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-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
       - name: Check workspace
         run: |
           repourl=$(echo $GU | cut -d '/' -f 3)
@@ -34,26 +25,6 @@ jobs:
         env:
           GU: ${{ gitea.server_url }}
           GR: ${{ gitea.repository }}
-      - name: Parse target branch and tag from events context, save to env
-        env:
-          EV: ${{ toJson(gitea.event) }}
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "ORG=$org" >> ${GITHUB_ENV}
-          echo "ORG=$org"
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          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 ||:
-        env:
-          ORG: ${{ env.ORG }}
       - name: Set repo for c10f2 (Temporary)
         if: ${{ contains(github.ref_name, 'c10f2') }}
         run: |
@@ -61,26 +32,42 @@ jobs:
           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 podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
+      - 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 }}
+          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 base with riskv64 for sisyphus if it is
-          if [[ "$BR" == "sisyphus" && "$ORG" == "base" ]]; then echo "${{ gitea.workspace }}/build.py --log-level debug -i base/base -b $BR --latest $BR --registry $BUILD_URL"; ${{ gitea.workspace }}/build.py -i base/base -b "$BR" --latest "$BR" --registry "$BUILD_URL"; fi
-          build_args="-b $BR --log-level debug --latest $BR -o $ORG --registry $BUILD_URL"
-          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64 --skip-images base/base"; else arches="--arches amd64 386 arm64"; fi 
-          echo "${{ gitea.workspace }}/build.py $build_args $arches"
-          ${{ gitea.workspace }}/build.py $build_args $arches
+          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
+          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 }}
-          BUILD_URL: "gitea.basealt.ru/alt"
         continue-on-error: true
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}
@@ -98,7 +85,7 @@ jobs:
         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"
+          echo "tag $tagname is deleted"                    
         env:
           T: ${{ secrets.TOKEN }}
           BR: ${{ env.BRANCH }}
@@ -107,8 +94,8 @@ jobs:
           EV: ${{ toJson(gitea.event) }}
   test-process:
     needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' && needs.build-process.outputs.org != 'k8s' }}
-    runs-on: alt-sisyphus
+    if: ${{ needs.build-process.outputs.buildres == 'success' }}
+    runs-on: alt-p10
     steps:
       - name: Update apt
         uses: actions/init-alt-env@v1

.gitea/workflows/wf_full_p11.yaml

@@ -0,0 +1,133 @@
+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 podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
+      - 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"          
+          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 }}

.gitea/workflows/wf_full_sis.yaml

@@ -2,7 +2,7 @@ name: Full building alt images
 on:
   push:
     tags:
-      - "*_k8s"
+      - 'sisyphus_*'
 
 jobs:
   build-process:
@@ -25,59 +25,42 @@ 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
         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-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
-      - name: Parse target branch and tag from events context, save to env
+          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
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
+      - 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) }}
+          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" >> ${GITHUB_ENV}                              
           echo "ORG=$org"
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          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 ||:
-        env:
-          ORG: ${{ env.ORG }}
       - name: Login podman gitea
         run: |
           echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ 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: |
-          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
-          build_args="--registry $BUILD_URL $arches"
-          #run build script
-          ${{ gitea.workspace }}/.gitea/workflows/k8s_buildscript.py --branch "$BR" --other-build-args "$build_args" --workspace "${{ gitea.workspace }}"
+          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
+          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 }}
-          BUILD_URL: "gitea.basealt.ru/alt"
         continue-on-error: true
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}
@@ -95,10 +78,49 @@ jobs:
         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"
+          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 }}

.gitea/workflows/wf_single.yaml

@@ -2,11 +2,11 @@ name: Building alt images
 on:
   push:
     tags:
-      - '*_*/*_*'
+      - '*_*/*'
 
 jobs:
   build-process:
-    runs-on: alt-sisyphus
+    runs-on: alt-latest
     outputs:
       branch: ${{ env.BRANCH }}
       image: ${{ env.IMAGE }}
@@ -37,10 +37,10 @@ jobs:
         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
+          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
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc          
       - name: Check out current repo
         uses: actions/checkout@v4
       - name: Login podman gitea
@@ -52,48 +52,34 @@ jobs:
           P_PASS: ${{ secrets.PODMAN_PASS }}
       - name: Check files in the repository
         run: |
-          ls -a ${{ gitea.workspace }}
+          ls -a ${{ gitea.workspace }}          
       - name: Parse target branch and tag from events context, save to env                                
         env:
-          EV: ${{ toJson(gitea.event) }}
+          EV: ${{ toJson(gitea.event) }}                                         
         run: |
           echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
           echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
           localimage=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "IMAGE=$localimage" >> ${GITHUB_ENV}
+          echo "IMAGE=$localimage" >> ${GITHUB_ENV}                              
           echo "IMAGE=$localimage"
           org=$(echo "$localimage" | cut -d '/' -f 1)
           echo "ORG=$org" >> ${GITHUB_ENV}
           echo "ORG=$org"
-          ver=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 3)
-          echo "VER=$ver" >> ${GITHUB_ENV}
-          echo "VER=$ver"
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          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 ||:
-        env:                                                                                                               
-          ORG: ${{ env.ORG }}
       - name: Get test for image
         run: |
           if test -f ${{ gitea.workspace }}/org/$IM/test; then testscript=$(cat ${{ gitea.workspace }}/org/$IM/test); else testscript=""; fi
-          echo "TEST=$testscript" >> ${GITHUB_ENV}
-        env:
+          echo "TEST=$testscript" >> ${GITHUB_ENV}          
+        env:                                     
           IM: ${{ env.IMAGE }}
           BR: ${{ env.BRANCH }}
       - name: Run building script
         id: build-script
         run: |
-          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--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 $arches $k8sarg"
-          ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches --latest $BR --log-level debug --registry gitea.basealt.ru/alt $k8sarg 
+          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--tags=tags.toml --overwrite-organization $ORG-$BR"; else k8sarg=""; fi
+          echo "build.py -i $IM -b $BR"
+          ${{ gitea.workspace }}/build.py -i $IM -b $BR $k8sarg        
         env:
           IM: ${{ env.IMAGE }}
-          VER: ${{ env.VER }}
           BR: ${{ env.BRANCH }}
           ORG: ${{ env.ORG }}
         continue-on-error: true
@@ -103,7 +89,7 @@ jobs:
           issueid=1
           body="Building image $IM 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" 
+          echo "notification about test error is sent to issue $issueid"          
         env:
           T: ${{ secrets.TOKEN }}
           BR: ${{ env.BRANCH }}
@@ -114,7 +100,7 @@ jobs:
         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"
+          echo "tag $tagname is deleted"                              
         env:
           T: ${{ secrets.TOKEN }}
           BR: ${{ env.BRANCH }}
@@ -124,7 +110,7 @@ jobs:
   test-process:
     needs: build-process
     if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-sisyphus
+    runs-on: alt-latest
     steps:
       - name: Update apt
         uses: https://gitea.basealt.ru/actions/init-alt-env@v1
@@ -137,9 +123,8 @@ jobs:
         if: ${{ needs.build-process.outputs.test != '' }}
         continue-on-error: true
         run: |
-          imname=$(echo "$IM" | cut -d "/" -f2)
-          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$REPO/$BR/$imname:latest -c "$TEST"; fi
-        env:
+          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
+        env:                
           IM: ${{ needs.build-process.outputs.image }} 
           BR: ${{ needs.build-process.outputs.branch }}
           URL: ${{ needs.build-process.outputs.url }}  
@@ -150,9 +135,8 @@ jobs:
         if: ${{ needs.build-process.outputs.test == '' }}
         continue-on-error: true
         run: |
-          imname=$(echo "$IM" | cut -d "/" -f2)
-          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest true; fi
-          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest --version; fi
+          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$IM:$BR true; fi
+          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$IM:$BR --version; fi
         env:
           IM: ${{ needs.build-process.outputs.image }}
           BR: ${{ needs.build-process.outputs.branch }}

README.md

@@ -1,5 +1,22 @@
 # image-forge
 
+## Wrapper
+
+### Examples
+
+From the repository
+
+```shell
+image-build -b sisyphus -r registry.altlinux.org --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+```
+
+From a task
+
+```shell
+image-build -b sisyphus -r test.registry.altlinux.org -t 335250 --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+```
+
+
 ## alt images
 To build `alt` images, run:
 ```bash
@@ -26,88 +43,10 @@ the organization `<ORGANIZATION>`, run:
 ```
 If you push to the users repository, then organiztion is your username.
 
-## info.yaml format
-
-- `is_versioned`: **bool** (REQUIRED)
-
-  Whether to use package version as a tag for this image
-
-- `source_packages`: **list of strings** (REQUIRED)
-
-  List of source packages (src.rpm) this image depends on.
-  If contains jinja2 template syntax, `--package-version`
-  CLI option must be specified.
-
-- `version_template`: **string** or **list of strings** (OPTIONAL)
-
-  Template to apply when construction the tag,
-  `version` string variable is available in the template.
-  If `version_template` is a list of strings, then the image wiil be tagged
-  with every string in the list.
-
-### examples
-
-
-#### org/k8s/flannel-cni-plugin
-
-```yaml
-is_versioned: true
-version_template: v{{ version.rsplit('.', 1) | first  }}-flannel{{ version.rsplit('.', 1) | last }}
-source_packages:
-  - cni-plugin-flannel
-```
-
-```bash
-./build.py -i k8s/flannel-cni-plugin
-```
-
-#### org/k8s/kube-apiserver
-
-```yaml
-is_versioned: true
-version_template: v{{ version }}
-source_packages:
-  - kubernetes{{ version }}
-```
-
-```bash
-./build.py -b sisyphus -i k8s/kube-apiserver --package-version '{"k8s/kube-apiserver": "1.31"}'
-```
-
-#### org/k8s/pause
-
-```yaml
-is_versioned: true
-source_packages:
-  - kubernetes-pause
-```
-
-```bash
-./build.py -i k8s/pause
-```
-
-#### org/k8s/etcd
-
-```yaml
-is_versioned: true
-version_template:
-  - "v{{ version }}"
-  - "{{ version }}"
-  - "{{ version }}-0"
-source_packages:
-  - etcd-for-kubernetes{{ version }}
-```
-
-```bash
-./build.py -b sisyphus -i k8s/etcd --package-version '{"k8s/etcd": "1.32"}'
-```
-
 ## Dependencies
 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

build.py

@@ -3,77 +3,29 @@
 import argparse
 import functools
 import json
-import logging
 import re
 import subprocess
 import textwrap
-from datetime import datetime
-from dataclasses import dataclass
 from graphlib import TopologicalSorter
 from pathlib import Path
-from typing import Optional, Union
 
-import requests
 import tomli
-import yaml
-from jinja2 import Environment, BaseLoader
+from jinja2 import Template
 
-logger = logging.getLogger(__name__)
-clean_images_counter = 0
-clean_images_limit_count = 0
 
 ORG_DIR = Path("org")
 
-PKG_VERSIONS: Optional[dict] = None
+PKG_VERSION: str = ""
 
-# Jinja2 custom fail filter
-def fail(message: str):
-    raise ValueError(message)
-
-JINJA_ENV = Environment(loader=BaseLoader())
-JINJA_ENV.filters['fail'] = fail
-
-@dataclass
 class Image:
-    canonical_name: str
-    is_versioned: Optional[bool]
-    version_template: Union[list[str], str, None]
-    source_packages: Optional[list[str]]
-
-    def __init__(self, canonical_name: str):
+    def __init__(self, canonical_name):
         self.canonical_name = canonical_name
         self.path = ORG_DIR / canonical_name
         self.base_name = re.sub("^[^/]+/", "", canonical_name)
 
-        info_file = self.path / "info.yaml"
-        if not info_file.exists():
-            self.is_versioned = None
-            self.source_packages = None
-            return
-
-        info: dict = yaml.safe_load(info_file.read_text())
-
-        if "is_versioned" not in info:
-            raise RuntimeError(
-                f"info.yaml for {self.canonical_name} doesn't contain 'is_versioned' key"
-            )
-
-        if "source_packages" not in info:
-            raise RuntimeError(
-                f"info.yaml for {self.canonical_name} doesn't contain 'source_packages' key"
-            )
-
-        self.is_versioned = info["is_versioned"]
-        self.source_packages = info["source_packages"]
-
-        if self.is_versioned and not self.source_packages:
-            raise RuntimeError(
-                f"source_packages for {self.canonical_name} doesn't contain any values"
-            )
-
-        self.version_template = None
-        if "version_template" in info:
-            self.version_template = info["version_template"]
+    def __str__(self):
+        return (f'Image(canonical_name="{self.canonical_name}", '
+                f'path="{self.path}", base_name="{self.base_name}")')
 
 
 class Tasks:
@@ -98,147 +50,22 @@ class Tasks:
                 ]
 
 
-def api_get_source_package_version(branch: str, package_name: str) -> str:
-    api_url = "https://rdb.altlinux.org/api/site/package_versions_from_tasks"
-    params = {"branch": branch, "name": package_name}
-    response = requests.get(api_url, params)
-    if response.status_code != 200:
-        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:
-            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} "
-        )
-
-    result = response.json()
-
-    return result["versions"][0]["version"]
-
-
-def api_get_source_package_version_from_task(task_id: str, package_name: str):
-    api_url = f"https://rdb.altlinux.org/api/task/packages/{task_id}"
-    response = requests.get(api_url)
-    if response.status_code != 200:
-        raise RuntimeError(
-            f"failed to retrieve source package version from task: source package {package_name!r}, task_id {task_id}"
-        )
-
-    result = response.json()
-    for subtask in result["subtasks"]:
-        if subtask["source"]["name"] == package_name:
-            return subtask["source"]["version"]
-
-    raise RuntimeError(
-        f"failed to retrieve source package version from task: source package {package_name!r}, task_id {task_id}"
-    )
-
-
 class Tags:
-    def __init__(self, tags_file: Optional[str], latest: str):
+    def __init__(self, tags_file, latest):
         if tags_file is None:
             self._tags = None
         else:
-            self._tags = tomli.loads(Path(tags_file).read_text())
+            tags_file = Path(tags_file)
+            self._tags = tomli.loads(tags_file.read_text())
         self._latest = latest
 
-    def tags(self, branch: str, image: Image, tasks: Optional[Tasks] = None):
+    def tags(self, branch, image: Image):
         if self._tags is None:
-            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]
-
-                context_version = ""
-                if re.search("{{.*}}", package_name):
-                    if PKG_VERSIONS is None:
-                        raise RuntimeError(
-                            f"--package-versions option is not specified, required for {image.canonical_name!r}"
-                        )
-
-                    if image.canonical_name not in PKG_VERSIONS:
-                        raise RuntimeError(
-                            f"--package-versions option does not contain version for image {image.canonical_name!r}"
-                        )
-
-                    if not PKG_VERSIONS[image.canonical_name]:
-                        raise RuntimeError(
-                            f"invalid version for image {image.canonical_name!r}: {PKG_VERSIONS[image.canonical_name]!r}"
-                        )
-
-                    context_version = PKG_VERSIONS[image.canonical_name]
-
-                if re.search("{%.*%}", package_name) or re.search("{{.*}}", package_name):
-                    package_name = JINJA_ENV.from_string(package_name).render(
-                        branch=branch,
-                        version=context_version,
-                    )
-
-                if tasks is not None:
-                    task_ids = tasks.get(branch, image)
-                else:
-                    task_ids = []
-
-                if task_ids:
-                    logger.info(
-                        "getting %s package version from task %s",
-                        package_name,
-                        task_ids[0],
-                    )
-                    version = api_get_source_package_version_from_task(
-                        task_ids[0], package_name
-                    )
-                else:
-                    logger.info(
-                        "getting %s package version from repo %s",
-                        package_name,
-                        branch,
-                    )
-                    version = api_get_source_package_version(branch, package_name)
-
-                tags = []
-                if image.version_template is not None:
-                    if isinstance(image.version_template, str):
-                        version_tag = (
-                            JINJA_ENV.from_string(image.version_template).render(version=version).strip()
-                        )
-                        tags.append(version_tag)
-                    elif isinstance(image.version_template, list):
-                        for v in image.version_template:
-                            version_tag = (
-                                JINJA_ENV.from_string(v).render(version=version).strip()
-                            )
-                            tags.append(version_tag)
-                    else:
-                        raise RuntimeError(f"expected type for version_template: 'str' or 'list[str]', got '{type(image.version_template)}' for image {image}")
-                else:
-                    tags.append(version)
-
-                tags.append("latest")
-            else:
-                version = datetime.now().strftime('%Y%m%d')
-                if image.version_template is not None:
-                    if not isinstance(image.version_template, str):
-                        raise RuntimeError(f"expected type for version_template: 'str', got '{type(image.version_template)}' for image {image}")
-                    version = (
-                        JINJA_ENV.from_string(image.version_template).render(version=version).strip()
-                    )
-                tags = [version]
-                tags.append("latest")
+            tags = [branch]
         else:
             tags = self._tags[image.canonical_name][branch].copy()
-
+        if branch == self._latest:
+            tags.append("latest")
         return tags
 
 
@@ -281,10 +108,6 @@ 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:
@@ -331,10 +154,9 @@ 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}/)?(:?{branch}/)?{name}(:?:{tag})?"
+        return rf"(:?{registry}/)?(:?{organization}/)?{name}(:?:{tag})?"
 
     def make_dockerfile_from_re(self):
         image_re = self.make_image_re()
@@ -343,7 +165,6 @@ class DockerBuilder:
     def __init__(
         self,
         registry,
-        overwrite_registry,
         branch,
         organization,
         overwrite_organization,
@@ -358,13 +179,12 @@ 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:
             self.overwrite_organization = overwrite_organization
         else:
-            self.overwrite_organization = branch
+            self.overwrite_organization = organization
         self.latest = latest
         self.dry_run = dry_run
         self.images_info = images_info
@@ -411,17 +231,16 @@ class DockerBuilder:
     ) -> str:
         if self.registry:
             registry = self.registry.rstrip("/") + "/"
-            alt_image = "alt"
+            alt_image = "alt/alt"
         else:
             registry = ""
             alt_image = "alt"
-        rendered = JINJA_ENV.from_string(template).render(
+        rendered = Template(template).render(
             alt_image=alt_image,
             branch=self.branch,
             install_packages=install_packages,
             organization=organization,
             registry=registry,
-            pkg_versions=PKG_VERSIONS,
             **kwargs,
         )
 
@@ -486,7 +305,7 @@ class DockerBuilder:
                     from_image = match.groupdict()
                     if from_image["name"] != "scratch":
                         requires.add(
-                            f"{self.organization}/{from_image['name']}"
+                            f"{from_image['organization']}/{from_image['name']}"
                         )
         elif distrolessfile.exists():
             requires.add("alt/distroless-builder")
@@ -495,7 +314,7 @@ class DockerBuilder:
             if match := re.match(self.image_re, from_):
                 from_image = match.groupdict()
                 if from_image["name"] != "scratch":
-                    requires.add(f"{self.organization}/{from_image['name']}")
+                    requires.add(f"{from_image['organization']}/{from_image['name']}")
 
         return (canonical_name, requires)
 
@@ -515,15 +334,6 @@ 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
@@ -531,14 +341,12 @@ class DockerBuilder:
             pre_cmd = ["echo"]
         else:
             pre_cmd = []
-
-        logger.debug("run: %s", pre_cmd + cmd)
         subprocess.run(pre_cmd + cmd, *args, **kwargs)
 
     def distroless_build(self, image: Image, arches):
         def distroless_build_arch(arch, manifest):
             distroless_builder = self.render_full_tag(
-                Image("alt/distroless-builder"), "latest"
+                Image("alt/distroless-builder"), self.branch
             )
             distroless = self.distrolesses[image.canonical_name]
             distroless.render_arch_branch(arch, self.branch)
@@ -679,7 +487,7 @@ class DockerBuilder:
         build_arches = set(arches) - set(
             self.images_info.skip_arches(image.canonical_name)
         )
-        tags = self.tags.tags(self.branch, image, self.tasks)
+        tags = self.tags.tags(self.branch, image)
         manifest = self.render_full_tag(image, tags[0])
 
         msg = "Building image {} for {} arches".format(
@@ -730,7 +538,7 @@ class DockerBuilder:
             self.images_info.skip_arches(image.canonical_name)
         )
         platforms = ",".join([f"linux/{a}" for a in build_arches])
-        tags = self.tags.tags(self.branch, image, self.tasks)
+        tags = self.tags.tags(self.branch, image)
         manifest = self.render_full_tag(image, tags[0])
 
         msg = "Building image {} for {} arches".format(
@@ -771,14 +579,9 @@ class DockerBuilder:
             "--force-rm",
             f"--manifest={manifest}",
             f"--platform={platforms}",
+            f'--build-arg=PKG_VERSION={PKG_VERSION}',
             ".",
         ]
-
-        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:]:
@@ -790,45 +593,23 @@ class DockerBuilder:
         if self.images_info.skip_branch(image.canonical_name, self.branch):
             return
 
-        tags = self.tags.tags(self.branch, image, self.tasks)
+        tags = self.tags.tags(self.branch, image)
+        manifests = [self.render_full_tag(image, t) for t in tags]
 
-        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}")
+        for manifest in manifests:
+            print(f"Push manifest {manifest}")
             cmd = [
                 "podman",
                 "manifest",
                 "push",
                 manifest,
-                f"docker://{push_manifest}",
+                f"docker://{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
-
-            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:
@@ -859,14 +640,12 @@ class ImagesInfo:
 
 def parse_args():
     stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
-    arches = ["amd64", "386", "arm64", "loong64", "riscv64"]
+    arches = ["amd64", "386", "arm64"]
     branches = ["p11", "p10", "sisyphus", "c10f1", "c10f2"]
     organizations = list(ORG_DIR.iterdir())
     images = [f"{o.name}/{i.name}" for o in organizations for i in o.iterdir()]
     organizations = [o.name for o in organizations]
 
-    log_levels = ["debug", "info", "warning", "error", "critical"]
-
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
@@ -900,22 +679,9 @@ 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",
@@ -986,15 +752,8 @@ def parse_args():
         help="list of stages to skip",
     )
     parser.add_argument(
-        "--package-versions",
-        type=json.loads,
-        help="json string where key is image name, value is the package version",
-    )
-    parser.add_argument(
-        "--log-level",
-        default="warning",
-        choices=log_levels,
-        help="log messages above specified level",
+        "--package-version",
+        help="from which package to build",
     )
     args = parser.parse_args()
 
@@ -1003,25 +762,14 @@ 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
 
 
 def main():
-    global PKG_VERSIONS
+    global PKG_VERSION
 
     args = parse_args()
-    PKG_VERSIONS = args.package_versions
-
-    numeric_level = getattr(logging, args.log_level.upper(), logging.WARNING)
-    logging.basicConfig(
-        level=numeric_level, format="%(asctime)s - %(levelname)s\t- %(message)s"
-    )
-
-    logger.info("PKG_VERSIONS=%s", PKG_VERSIONS)
-
+    PKG_VERSION = args.package_version
     arches = args.arches
     images_info = ImagesInfo()
     tags = Tags(args.tags, args.latest)
@@ -1029,7 +777,6 @@ def main():
         for branch in args.branches:
             db = DockerBuilder(
                 args.registry,
-                args.overwrite_registry,
                 branch,
                 organization,
                 args.overwrite_organization,

image-build.md

@@ -0,0 +1,7 @@
+## Examples
+
+Build `kube-apisever` image from package `kubernetes1.31`:
+
+```bash
+./image-build.py -b sisyphus -r registry.altlinux.org kube-apiserver kubernetes1.31
+```

image-build.py

@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+
+import argparse
+import logging
+import re
+import subprocess
+from pathlib import Path
+
+import requests
+
+LOGGING_FORMAT = "%(asctime)s %(name)s %(levelname)s %(message)s"
+logging.basicConfig(format=LOGGING_FORMAT)
+logger = logging.getLogger(__name__)
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="build an OCI image from a package",
+        epilog="""The image is only pushed to the destination registry
+        if the option --push is present.""",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+
+    parser.add_argument("image_name")
+    parser.add_argument("package_name")
+    parser.add_argument(
+        "-b",
+        "--branch",
+        default="sisyphus",
+        help="package repository branch",
+    )
+    parser.add_argument(
+        "-r",
+        "--registry",
+        default="registry.altlinux.org",
+        help="OCI destination registry",
+    )
+    parser.add_argument(
+        "-t",
+        "--task-id",
+        help="install the package from the task with this id",
+    )
+    parser.add_argument(
+        "--prefix",
+        help="image name prefix",
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="only print what would be done",
+    )
+    parser.add_argument(
+        "--latest",
+        action="store_true",
+        help="also tag this image as latest",
+    )
+    parser.add_argument(
+        "--push",
+        action="store_true",
+        help="push the image to the registry after build",
+    )
+    parser.add_argument(
+        "--skip-build",
+        action="store_true",
+        help="if push is true, then skip the build stage",
+    )
+    parser.add_argument(
+        "--log-level",
+        choices=["debug", "info", "warning"],
+        default="warning",
+        help="logging level",
+    )
+
+    return parser.parse_args()
+
+
+def api_get_source_package_version(branch: str, package_name: str) -> str:
+    api_url = "https://rdb.altlinux.org/api/site/package_versions_from_tasks"
+    params = {"branch": branch, "name": package_name}
+    response = requests.get(api_url, params)
+    if response.status_code != 200:
+        raise RuntimeError(
+            f"failed to retrieve package version: package {package_name!r}, branch {branch!r} "
+        )
+
+    result = response.json()
+
+    logger.debug("api/site/package_versions_from_tasks response=%s", result)
+
+    return result["versions"][0]["version"]
+
+
+def api_get_source_package_version_from_task(task_id: int, package_name: str) -> str:
+    api_url = f"https://rdb.altlinux.org/api/task/packages/{task_id}"
+    response = requests.get(api_url)
+    if response.status_code != 200:
+        raise RuntimeError(f"failed to retrieve information about task {task_id}")
+
+    result = response.json()
+
+    logger.debug("api/task/packages/%s response=%s", task_id, result)
+
+    for subtask in result["subtasks"]:
+        if subtask["source"]["name"] == package_name:
+            return subtask["source"]["version"]
+
+    raise RuntimeError(
+        f"vailed to retrieve version of package {package_name!r} from task {task_id}"
+    )
+
+
+def main() -> None:
+    args = parse_args()
+    logger.setLevel(args.log_level.upper())
+
+    image = f"k8s/{args.image_name}"
+    version_arg = None
+    tasks_file = None
+
+    if args.task_id is None:
+        version = api_get_source_package_version(args.branch, args.package_name)
+    else:
+        version = api_get_source_package_version_from_task(
+            args.task_id, args.package_name
+        )
+        tasks_file = "/tmp/k8s-tasks.toml"
+        tasks_file_contents = f"['{args.branch}']\n"
+        tasks_file_contents += f"{args.task_id} = ['{image}']\n"
+        Path(tasks_file).write_text(tasks_file_contents)
+
+    tags_file = "/tmp/k8s-tags.toml"
+    tags_file_contents = f"['{image}']\n"
+
+    match args.image_name:
+        case (
+            "etcd"
+            | "flannel"
+            | "flannel-cni-plugin"
+            | "pause"
+            | "cert-manager-acmesolver"
+            | "cert-manager-cainjector"
+            | "cert-manager-controller"
+            | "cert-manager-startupapicheck"
+            | "cert-manager-webhook"
+        ):
+            match args.image_name:
+                case "flannel-cni-plugin":
+                    num_dots = version.count(".")
+                    if num_dots == 2:
+                        tags_file_contents += (
+                            f"{args.branch} = ['v{version}-flannel1']\n"
+                        )
+                    elif num_dots == 3:
+                        flannel_version, flannel_release = version.rsplit(".", 1)
+                        tags_file_contents += f"{args.branch} = ['v{flannel_version}-flannel{flannel_release}']\n"
+                    else:
+                        raise RuntimeError(
+                            f"wrong version for package {args.package_name!r}, version {version!r}"
+                        )
+                case "etcd":
+                    tags_file_contents += f"{args.branch} = ['{version}-0']\n"
+                case "pause":
+                    tags_file_contents += f"{args.branch} = ['{version}']\n"
+                case _:
+                    tags_file_contents += f"{args.branch} = ['v{version}']\n"
+
+        case (
+            "kube-apiserver"
+            | "kube-controller-manager"
+            | "kube-scheduler"
+            | "kube-proxy"
+            | "coredns"
+        ):
+            match args.image_name:
+                case "coredns":
+                    regex_string = "coredns(.+)"
+                case (
+                    "kube-apiserver"
+                    | "kube-controller-manager"
+                    | "kube-scheduler"
+                    | "kube-proxy"
+                ):
+                    regex_string = "kubernetes(.+)"
+
+            version_match = re.search(regex_string, args.package_name)
+            if version_match is None:
+                raise RuntimeError(
+                    f"failed to retrieve version argument from package name: package {args.package_name!r}"
+                )
+
+            version_arg = version_match.group(1)
+
+            tags_file = "/tmp/k8s-tags.toml"
+            tags_file_contents = f"['{image}']\n"
+            tags_file_contents += f"{args.branch} = ['v{version}']\n"
+        case _:
+            raise RuntimeError(f"unknown image {args.image_name!r}")
+
+    Path(tags_file).write_text(tags_file_contents)
+
+    command = [
+        "./build.py",
+        f"--branch={args.branch}",
+        f"--registry={args.registry}",
+        f"--image={image}",
+        f"--tags={tags_file}",
+    ]
+
+    if tasks_file is not None:
+        command.append(f"--tasks={tasks_file}")
+
+    if version_arg is not None:
+        command.append(f"--package-version={version_arg}")
+
+    if args.prefix is not None:
+        command.append(f"--overwrite-organization={args.prefix}")
+
+    if args.latest:
+        command.append(f"--latest={args.branch}")
+
+    if not args.push:
+        command.append("--skip-stages=push")
+    elif args.skip_build:
+        command.append("--stages=push")
+
+    if args.dry_run:
+        command.append("--dry-run")
+
+    logger.debug("Running command: %s", command)
+    subprocess.run(command, check=True)
+
+
+if __name__ == "__main__":
+    main()

images-info.toml

@@ -1,14 +1,8 @@
-["base/distroless-toybox"]
-skip-branches = [ "p10", "c10f2", "c10f1" ]
+["alt/buildpack-deps"]
+skip-branches = [ "p9" ]
 
 ["alt/openjdk21"]
 skip-arches = [ "386" ]
 
-["alt/zot"]
-skip-arches = [ "386" ]
-
 ["alt/ansible"]
 skip-branches = [ "c10f2", "c10f1", "p10" ]
-
-["alt/buildkit"]
-skip-branches = [ "c10f1", "p10" ]

org/alt/ansible/Dockerfile.template

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

org/alt/ansible/info.yaml

@@ -1,8 +0,0 @@
----
-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 }}{{ branch }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 

org/alt/apache2/info.yaml

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

org/alt/base/Dockerfile.template

@@ -0,0 +1,7 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+{{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
+
+CMD ["bash"]

org/alt/buildkit/Dockerfile.template

@@ -1,16 +0,0 @@
-FROM {{ registry }}{{ branch }}/base:latest
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="buildkit"
-LABEL org.opencontainers.image.description="Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"
-LABEL org.opencontainers.image.source="https://github.com/moby/buildkit"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
-    "ca-certificates",
-    "buildkit"
-) }}
-
-ENTRYPOINT ["/usr/bin/buildkitd"]

org/alt/buildkit/info.yaml

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

org/alt/buildkit/test

@@ -1 +0,0 @@
-buildkitd --version

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

@@ -1,9 +1,8 @@
-FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 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"
 

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

@@ -1,10 +1,9 @@
-FROM {{ registry }}{{ branch }}/buildpack-deps-curl:latest
+FROM {{ registry }}{{ organization }}/buildpack-deps-curl:{{ branch }}
 
 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(

org/alt/buildpack-deps/Dockerfile.template

@@ -1,9 +1,8 @@
-FROM {{ registry }}{{ branch }}/buildpack-deps-scm:latest
+FROM {{ registry }}{{ organization }}/buildpack-deps-scm:{{ branch }}
 
 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"
 

org/alt/devel/Dockerfile.template

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

org/alt/distroless-base/distroless.toml

@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ branch }}/distroless-static:latest"
+from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
 builder-install-packages = [
     "glibc-core",
     '{{if_branches(["p10"], "glibc-nss")}}',
@@ -19,4 +19,3 @@ 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"}

org/alt/distroless-builder/Dockerfile.template

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

org/alt/distroless-devel/distroless.toml

@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ branch }}/distroless-base:latest"
+from = "{{ registry }}{{ organization }}/distroless-base:{{ branch }}"
 builder-install-packages = [
     "coreutils",
     "findutils",
@@ -37,4 +37,3 @@ 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"}

org/alt/distroless-gotop/distroless.toml

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

org/alt/distroless-static/distroless.toml

@@ -0,0 +1,4 @@
+from = "scratch"
+file-lists = ["static.list"]
+user = "nonroot"
+workdir = "/home/nonroot"

org/alt/distroless-true/distroless.toml

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

org/alt/etcd/Dockerfile.template

@@ -0,0 +1,15 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="etcd"
+LABEL org.opencontainers.image.description="Distributed reliable key-value store for the most critical data of a distributed system"
+LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("etcd") }}
+
+VOLUME /data
+
+ENTRYPOINT ["/usr/sbin/etcd", "--data-dir", "/data"]

org/alt/etcd/README.md

@@ -0,0 +1,13 @@
+dockerfiles-alt-etcd
+=========================
+
+ALT dockerfile for etcd.
+
+Copy Dockerfile somewhere and build the image:
+`$ docker build --rm -t <username>/etcd.`
+
+And launch the etcd container:
+`docker run -d -v <etcd data dir>:/data <username>/etcd`
+
+If etcdclt watnted it could be run via:
+`docker run --entrypoint etcdctl <username>/etcd`

org/alt/etcd/test

@@ -0,0 +1 @@
+etcdctl version

org/alt/gitea/Dockerfile.template

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

org/alt/gitea/info.yaml

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

org/alt/golang/Dockerfile.template

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

org/alt/golang/info.yaml

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

org/alt/grafana/Dockerfile.template

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

org/alt/grafana/info.yaml

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

org/alt/loki/Dockerfile.template

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

org/alt/loki/info.yaml

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

org/alt/nginx/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 MAINTAINER alt-cloud
 
@@ -15,7 +15,7 @@ RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .
 RUN ln -sf /dev/stdout /var/log/nginx/access.log
 RUN ln -sf /dev/stderr /var/log/nginx/error.log
 
-RUN sed -Ei 's/^([[:space:]]*listen[[:space:]]+)(localhost|127.0.0.1)(:80)/\10.0.0.0\3/' \
+RUN sed -Ei 's/^([[:space:]]*listen[[:space:]]+)localhost(:80)/\10.0.0.0\2/' \
             /etc/nginx/sites-available.d/default.conf
 
 EXPOSE 80

org/alt/nginx/info.yaml

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

org/alt/node/Dockerfile.template

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

org/alt/node/info.yaml

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

org/alt/openjdk21/Dockerfile.template

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

org/alt/openjdk21/info.yaml

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

org/alt/php/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ branch }}/base:latest
+FROM {{ registry }}{{ organization }}/base:{{ branch }}
 
 MAINTAINER alt-cloud
 
@@ -8,14 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/php/php-src"
 LABEL org.opencontainers.image.licenses="PHP-3.01"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{% if branch == 'p10' %}
 {{ install_packages(
-	"php8.2",
-	"php8.2-xdebug",
+"php8.2",
+"php8.2-xdebug",
 ) }}
-{% else %}
-{{ install_packages(
-	"php8.3",
-	"php8.3-xdebug",
-) }}
-{% endif %}

org/alt/php/info.yaml

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

org/alt/postgresql/Dockerfile.template

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

org/alt/postgresql/info.yaml

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

org/alt/prometheus-alertmanager/Dockerfile.template

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

org/alt/prometheus-alertmanager/info.yaml

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

org/alt/prometheus-node_exporter/Dockerfile.template

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

org/alt/prometheus-node_exporter/info.yaml

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

org/alt/prometheus/Dockerfile.template

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

org/alt/prometheus/info.yaml

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

org/alt/python/Dockerfile.template

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

org/alt/python/info.yaml

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

org/alt/python2/Dockerfile.template

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

org/alt/python2/info.yaml

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

org/alt/rabbitmq/Dockerfile.template

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

org/alt/rabbitmq/info.yaml

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

org/alt/registry/Dockerfile.template

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

org/alt/registry/info.yaml

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

org/alt/ruby/Dockerfile.template

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

org/alt/ruby/info.yaml

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

org/alt/systemd/Dockerfile.template

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

org/alt/systemd/info.yaml

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

org/alt/trivy/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
 
 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

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

org/alt/unit/Dockerfile.template

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

org/alt/unit/info.yaml

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

org/alt/zot/Dockerfile.template

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

org/alt/zot/info.yaml

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

org/base/base/Dockerfile.template

@@ -1,12 +0,0 @@
-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"]

org/base/base/info.yaml

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

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

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

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

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

org/base/buildpack-deps/info.yaml

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

org/base/devel/info.yaml

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

org/base/distroless-base/info.yaml

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

org/base/distroless-builder/info.yaml

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