Add support for versioned building from tasks

The first package in the list is used to form the image tag based
on the package version.

.gitea/workflows/testscript

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

.gitea/workflows/wf_full.yaml

@@ -2,11 +2,11 @@ name: Full building alt images
 on:
   push:
     tags:
-      - '*10*_*'
+      - '*_*'
 
 jobs:
   build-process:
-    runs-on: alt-p10
+    runs-on: alt-sisyphus
     outputs:
       branch: ${{ env.BRANCH }}
       org: ${{ env.ORG }}
@@ -36,10 +36,10 @@ jobs:
         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"
+          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 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"
+          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          
+          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
@@ -61,10 +61,11 @@ jobs:
       - name: Run building script
         id: build-script
         run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
+          build_args="-b $BR --latest $BR -o $ORG --registry gitea.basealt.ru/alt"
-          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
+          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
-          echo "build.py $build_args"
+          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
-          ${{ gitea.workspace }}/build.py $build_args
+          echo "build.py $build_args $arches"
+          ${{ gitea.workspace }}/build.py $build_args $arches
         env:
           ORG: ${{ env.ORG }}
           BR: ${{ env.BRANCH }}
@@ -94,8 +95,8 @@ jobs:
           EV: ${{ toJson(gitea.event) }}
   test-process:
     needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
+    if: ${{ needs.build-process.outputs.buildres == 'success' && needs.build-process.outputs.org != 'k8s' }}
-    runs-on: alt-p10
+    runs-on: alt-sisyphus
     steps:
       - name: Update apt
         uses: actions/init-alt-env@v1

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

@@ -1,126 +0,0 @@
-name: Full building alt images
-on:
-  push:
-    tags:
-      - 'sisyphus_*'
-
-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: 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_single.yaml

@@ -2,11 +2,11 @@ name: Building alt images
 on:
   push:
     tags:
-      - '*_*/*'
+      - '*_*/*_*'
 
 jobs:
   build-process:
-    runs-on: alt-latest
+    runs-on: alt-sisyphus
     outputs:
       branch: ${{ env.BRANCH }}
       image: ${{ env.IMAGE }}
@@ -26,14 +26,21 @@ 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 podman buildah jq curl"
+          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 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"
+          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          
+          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: Login podman gitea
@@ -55,6 +62,12 @@ jobs:
           localimage=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
           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: Get test for image
         run: |
           if test -f ${{ gitea.workspace }}/org/$IM/test; then testscript=$(cat ${{ gitea.workspace }}/org/$IM/test); else testscript=""; fi
@@ -65,11 +78,15 @@ jobs:
       - name: Run building script
         id: build-script
         run: |
-          echo "build.py -i $IM -b $BR"
+          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--overwrite-organization $ORG-$BR --package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
-          ${{ gitea.workspace }}/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 }}
+          VER: ${{ env.VER }}
           BR: ${{ env.BRANCH }}
+          ORG: ${{ env.ORG }}
         continue-on-error: true
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}
@@ -98,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
@@ -111,7 +128,7 @@ jobs:
         if: ${{ needs.build-process.outputs.test != '' }}
         continue-on-error: true
         run: |
-          if [[ $BR = 'p10' ]]; then podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; else podman run --rm --entrypoint="/usr/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
+          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 }}

README.md

@@ -26,10 +26,70 @@ 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** (OPTIONAL)
+
+  template to apply when construction the tag,
+  `version` string variable is available in the template
+
+### 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
+```
+
 ## 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,28 +3,68 @@
 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
 
+import requests
 import tomli
+import yaml
 from jinja2 import Template
 
+logger = logging.getLogger(__name__)
 
 ORG_DIR = Path("org")
 
+PKG_VERSIONS: dict | None = None
 
+
+@dataclass
 class Image:
-    def __init__(self, canonical_name):
+    canonical_name: str
+    is_versioned: bool | None
+    version_template: str | None
+    source_packages: list[str] | None
+
+    def __init__(self, canonical_name: str):
         self.canonical_name = canonical_name
         self.path = ORG_DIR / canonical_name
         self.base_name = re.sub("^[^/]+/", "", canonical_name)
 
-    def __str__(self):
+        info_file = self.path / "info.yaml"
-        return (f'Image(canonical_name="{self.canonical_name}", '
+        if not info_file.exists():
-                f'path="{self.path}", base_name="{self.base_name}")')
+            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"]
 
 
 class Tasks:
@@ -49,22 +89,135 @@ 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:
+        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} "
+        )
+
+    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:
+        print(response)
+        raise RuntimeError(
+            f"failed to retrieve source package version from task: source package {package_name!r}, branch {branch!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}, branch {branch!r}, task_id {task_id}"
+    )
+
+
 class Tags:
-    def __init__(self, tags_file, latest):
+    def __init__(self, tags_file: str | None, latest: str):
         if tags_file is None:
             self._tags = None
         else:
-            tags_file = Path(tags_file)
+            self._tags = tomli.loads(Path(tags_file).read_text())
-            self._tags = tomli.loads(tags_file.read_text())
         self._latest = latest
 
-    def tags(self, branch, image: Image):
+    def tags(self, branch: str, image: Image, tasks: Tasks | None = None):
         if self._tags is None:
+            if image.is_versioned is None:
                 tags = [branch]
-        else:
-            tags = self._tags[image.canonical_name][branch].copy()
                 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):
+                    package_name = Template(package_name).render(branch=branch).strip()
+                    print(f"{package_name=}")
+
+                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}"
+                        )
+
+                    package_name = Template(package_name).render(
+                        version=PKG_VERSIONS[image.canonical_name]
+                    )
+
+                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)
+
+                if image.version_template is not None:
+                    version = (
+                        Template(image.version_template).render(version=version).strip()
+                    )
+
+                tags = [version]
+                tags.append("latest")
+            else:
+                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()
+
         return tags
 
 
@@ -107,6 +260,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:
@@ -153,9 +310,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()
@@ -183,7 +341,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
@@ -230,7 +388,7 @@ class DockerBuilder:
     ) -> str:
         if self.registry:
             registry = self.registry.rstrip("/") + "/"
-            alt_image = "alt/alt"
+            alt_image = "alt"
         else:
             registry = ""
             alt_image = "alt"
@@ -304,7 +462,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")
@@ -313,7 +471,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)
 
@@ -345,7 +503,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)
@@ -537,7 +695,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)
+        tags = self.tags.tags(self.branch, image, self.tasks)
         manifest = self.render_full_tag(image, tags[0])
 
         msg = "Building image {} for {} arches".format(
@@ -580,6 +738,12 @@ class DockerBuilder:
             f"--platform={platforms}",
             ".",
         ]
+
+        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:]:
@@ -591,7 +755,7 @@ class DockerBuilder:
         if self.images_info.skip_branch(image.canonical_name, self.branch):
             return
 
-        tags = self.tags.tags(self.branch, image)
+        tags = self.tags.tags(self.branch, image, self.tasks)
         manifests = [self.render_full_tag(image, t) for t in tags]
 
         for manifest in manifests:
@@ -638,12 +802,14 @@ class ImagesInfo:
 
 def parse_args():
     stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
-    arches = ["amd64", "386", "arm64"]
+    arches = ["amd64", "386", "arm64", "loong64", "riscv64"]
     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,
     )
@@ -749,6 +915,17 @@ def parse_args():
         choices=stages,
         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",
+    )
     args = parser.parse_args()
 
     args.stages = set(args.stages) - set(args.skip_stages)
@@ -760,7 +937,18 @@ def parse_args():
 
 
 def main():
+    global PKG_VERSIONS
+
     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)
+
     arches = args.arches
     images_info = ImagesInfo()
     tags = Tags(args.tags, args.latest)

images-info.toml

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

org/alt/ansible/Dockerfile.template

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

org/alt/ansible/info.yaml

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

org/alt/apache2/Dockerfile.template

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

org/alt/apache2/info.yaml

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

org/alt/base/Dockerfile.template

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

org/alt/distroless-gotop/distroless.toml

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

org/alt/distroless-static/distroless.toml

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

org/alt/distroless-true/distroless.toml

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

org/alt/etcd/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ alt_image }}:{{ branch }}
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
 
 MAINTAINER alt-cloud
 
@@ -10,6 +10,8 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 {{ install_packages("etcd") }}
 
+RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd
+
 VOLUME /data
 
 ENTRYPOINT ["/usr/sbin/etcd", "--data-dir", "/data"]

org/alt/etcd/info.yaml

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

org/alt/gitea/Dockerfile.template

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

org/alt/gitea/info.yaml

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

org/alt/golang/Dockerfile.template

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

org/alt/golang/info.yaml

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

org/alt/grafana/Dockerfile.template

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

org/alt/grafana/info.yaml

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

org/alt/loki/Dockerfile.template

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

org/alt/loki/info.yaml

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

org/alt/nginx/Dockerfile.template

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

org/alt/nginx/info.yaml

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

org/alt/node/Dockerfile.template

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

org/alt/node/info.yaml

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

org/alt/openjdk21/Dockerfile.template

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

org/alt/openjdk21/info.yaml

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

org/alt/php/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}{{ branch }}/base:latest
 
 MAINTAINER alt-cloud
 
@@ -8,7 +8,14 @@ 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",
-"php8.2-xdebug",
+	"php8.2-xdebug",
 ) }}
+{% else %}
+{{ install_packages(
+	"php8.3",
+	"php8.3-xdebug",
+) }}
+{% endif %}

org/alt/php/info.yaml

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

org/alt/postgresql/Dockerfile.template

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

org/alt/postgresql/info.yaml

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

org/alt/prometheus-alertmanager/Dockerfile.template

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

org/alt/prometheus-alertmanager/info.yaml

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

org/alt/prometheus-node_exporter/Dockerfile.template

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

org/alt/prometheus-node_exporter/info.yaml

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

org/alt/prometheus/Dockerfile.template

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

org/alt/prometheus/info.yaml

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

org/alt/python/Dockerfile.template

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

org/alt/python/info.yaml

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

org/alt/python2/Dockerfile.template

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

org/alt/python2/info.yaml

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

org/alt/rabbitmq/Dockerfile.template

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

org/alt/rabbitmq/info.yaml

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

org/alt/registry/Dockerfile.template

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

org/alt/registry/info.yaml

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

org/alt/ruby/Dockerfile.template

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

org/alt/ruby/info.yaml

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

org/alt/systemd/Dockerfile.template

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

org/alt/systemd/info.yaml

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

org/alt/trivy/Dockerfile.template

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

org/alt/trivy/info.yaml

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

org/alt/unit/Dockerfile.template

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

org/alt/unit/info.yaml

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

org/alt/zot/Dockerfile.template

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

org/alt/zot/info.yaml

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

org/base/base/Dockerfile.template

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

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

org/base/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"
 

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

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

org/base/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(

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

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

org/base/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"
 

org/base/buildpack-deps/info.yaml

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

org/base/devel/Dockerfile.template

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

org/base/devel/info.yaml

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

org/base/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"}

org/base/distroless-base/info.yaml

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

org/base/distroless-builder/Dockerfile.template

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

org/base/distroless-builder/info.yaml

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

org/base/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"}

org/base/distroless-devel/info.yaml

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

org/base/distroless-gotop/distroless.toml

@@ -0,0 +1,4 @@
+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"}

org/base/distroless-gotop/info.yaml

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

org/base/distroless-static/distroless.toml

@@ -0,0 +1,5 @@
+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"}

org/base/distroless-static/info.yaml

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

org/base/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`

org/base/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"}

org/base/distroless-toybox/info.yaml

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