change branches p*/c* workflow for new struct

.gitea/workflows/testscript

@@ -6,53 +6,70 @@
 #$4 - ${{ needs.build-process.outputs.repo }}
 #$5 - ${{ gitea.workspace }}
 
+BR=${1:-"p10"}
+ORG=${2:-"base"}
+URL=${3:-"gitea.basealt.ru"}
+REPO=${4:-"alt"}
+WS=${5:-"image-forge"}
+
 errors=''
 haserr=false
-for IM in $(ls $5/org/$2/ | xargs)
+for IM in $(ls $WS/org/$ORG/ | xargs)
 do 
   echo "image=$IM"
-  if test -f $5/org/$2/$IM/test
-  then 
-    test=$(cat $5/org/$2/$IM/test)
-  else test=''
-  fi 
+  imgpath="$REPO/$BR/$IM:$BR"
+  command=''
+  testpath="$WS/org/$ORG/$IM/test.yaml"
+  if test -f $testpath
+  then
+	entrypoint=''
+	testep=$(cat $testpath | yq '.entrypoint' -r 2> /dev/null)
+	if [[ $testep != '' ]]; then entrypoint="--entrypoint=\"$testep\""; fi 
 
-  echo "test script=$test"
-  imgpath="$2/$IM:$1"
-
-  if [[ $2 == 'k8s' ]]
-    then imgpath="$2-$1/$IM:latest"
+	testcom=$(cat $testpath | yq '.command' -r 2> /dev/null)
+	if [[ $testcom != '' ]]
+	then command="podman run --rm $entrypoint $URL/$imgpath -c \"$testcom\""
+	else echo "test command is not found"
+	fi	
+  else echo "test file is not found"
   fi
-
-  command="echo empty_command"
-  if [[ $test != '' ]]; then
-    command="podman run --rm --entrypoint=\"/bin/sh\" $3/$imgpath -c \"$test\""
-  else
-    if [[ $IM = 'distroless-true' ]]; then
-      command="podman run --rm $3/$imgpath \"true\""
-    fi
-    if [[ $IM = 'distroless-gotop' ]]; then 
-      command="podman run --rm $3/$imgpath \"--version\""
-    fi 
-    if [[ $IM = 'flannel-cni-plugin' ]]; then
-      command="podman run --rm $3/$imgpath \"/flannel\""
-    fi
-    if [[ $IM = 'pause' ]]; then 
-      command="podman run --rm $3/$imgpath \"/pause\" \"-v\""
-    fi 
-  fi
-  echo $command
+  echo "result test command: $command"
   eval $command 2>$IM.log || haserr=true
 
-  echo "podman rmi --all"
-  podman rmi --all
+  if [ "$haserr" = false ]
+  then
+    echo "start change tag for $IM"
+    if [[ $ORG != 'base' ]]
+    then
+	package=$(podman images --filter reference=$URL/$imgpath --format='{{ json .Labels }}' | jq '."org.opencontainers.image.title"' -r 2> /dev/null)
+    	if [[ $package != '' ]]
+    	then 
+		tag=$(podman run --rm --entrypoint="/bin/sh" $URL/$imgpath -c "rpm -qa --qf \"%{VERSION}\n\" $package" 2> /dev/null)
+	else
+		echo "not found package name in images labels"
+	fi 
+    else
+	then tag=$(date +"%Y%m%d")
+    fi
 
-  if [ "$haserr" = true ]
-  then 
+    if [[ $tag != '' ]]
+    then 
+	    skopeo copy -a docker://$URL/$imgpath:$BR  docker://$URL/$imgpath:$tag
+	    scopeo delete docker://$URL/$imgpath:$BR
+	    echo "tag is updated"
+    else echo "new tag is empty and is not sent to repository"
+    fi
+
+  else
     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"
-    fi 
+    fi
+  fi
+    
+  echo "podman rmi --all"
+  podman rmi --all
+
   fi 
   haserr=false
 done

.gitea/workflows/wf_full_p10.yaml

@@ -2,7 +2,10 @@ name: Full building alt images
 on:
   push:
     tags:
-      - '*10*_*'
+      - '*_*'
+    tags-ignore:
+      - '*_k8s'
+      - 'sisyphus_*'
 
 jobs:
   build-process:
@@ -58,12 +61,10 @@ jobs:
         env:
           P_USER: ${{ secrets.PODMAN_USER }}
           P_PASS: ${{ secrets.PODMAN_PASS }}
-      - name: Run building script
+      - name: Run standart building script
         id: build-script
         run: |
-          build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
-          if [[ $BR == 'c10f1' || $BR == 'c10f2' ]]; then build_args="$build_args --skip-arches arm ppc64le"; fi
-          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
+          build_args="-b $BR -o $ORG --skip-images base/distroless-devel --overwrite-organization $BR --registry $URL/$BR"          
           echo "build.py $build_args"
           ${{ gitea.workspace }}/build.py $build_args
         env:
@@ -102,11 +103,18 @@ 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 podman buildah skopeo jq yq 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
+      - name: Login podman gitea
+        run: |
+          echo "podman login ${{ env.URL }}"
+          podman login --username $P_USER --password $P_PASS ${{ needs.build-process.outputs.url }}          
+        env:
+          P_USER: ${{ secrets.PODMAN_USER }}
+          P_PASS: ${{ secrets.PODMAN_PASS }}
+      - name: Test images and update tags
         id: test-script
         continue-on-error: true
         run: |

.gitea/workflows/wf_full_sis.yaml

@@ -55,7 +55,6 @@ jobs:
         id: build-script
         run: |
           build_args="-b $BR -o $ORG --skip-images alt/distroless-devel"          
-          if [[ $BR == 'sisyphus' ]]; then build_args="$build_args --skip-arches arm"; fi
           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

build.py

@@ -638,8 +638,8 @@ class ImagesInfo:
 
 def parse_args():
     stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"]
-    arches = ["amd64", "386", "arm64", "arm", "ppc64le"]
-    branches = ["p9", "p10", "sisyphus", "c10f1", "c10f2"]
+    arches = ["amd64", "386", "arm64"]
+    branches = ["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]

org/alt/apache2/test

@@ -1 +0,0 @@
-apachectl -v

org/alt/base/test

@@ -1 +0,0 @@
-LC_ALL=ru_RU.UTF-8 TZ=/usr/share/zoneinfo/Europe/Moscow date| grep MSK

org/alt/buildpack-deps-curl/test

@@ -1 +0,0 @@
-curl --version && gpg --version

org/alt/buildpack-deps-scm/test

@@ -1 +0,0 @@
-git --version && hg --version

org/alt/buildpack-deps/test

@@ -1 +0,0 @@
-gcc --version && make --version

org/alt/distroless-builder/README.md

@@ -1,3 +0,0 @@
-ALT dockerfile for distroless-builder image.
-
-This images is using to build tarball for distroless images.

org/alt/distroless-builder/test

@@ -1 +0,0 @@
-apt-repo --version

org/alt/distroless-devel/test

@@ -1 +0,0 @@
-ss -V

org/alt/etcd/test

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

org/alt/gitea/test

@@ -1 +0,0 @@
-gitea --version

org/alt/nginx/test

@@ -1 +0,0 @@
-nginx -v

org/alt/node/test

@@ -1 +0,0 @@
-node -v

org/alt/prometheus/test

@@ -1 +0,0 @@
-prometheus --version

org/alt/python/test

@@ -1 +0,0 @@
-python3 --version

org/alt/registry/test

@@ -1 +0,0 @@
-registry --version

org/alt/ruby/test

@@ -1 +0,0 @@
-ruby --version

org/alt/systemd/test

@@ -1 +0,0 @@
-ls -la /sbin/init | grep systemd

org/alt/unit/test

@@ -1 +0,0 @@
-unitd --version

org/alt/zot/test

@@ -1 +0,0 @@
-zot verify /etc/zot/config.json

org/base/base/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "LC_ALL=ru_RU.UTF-8 TZ=/usr/share/zoneinfo/Europe/Moscow date| grep MSK"

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

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "curl --version && gpg --version"

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

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "git --version && hg --version"

org/base/buildpack-deps/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "gcc --version && make --version"

org/base/distroless-builder/Dockerfile.template

@@ -3,7 +3,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}
 MAINTAINER alt-cloud
 
 LABEL org.opencontainers.image.title="distroless-builder"
-LABEL org.opencontainers.image.description="This images is using to build tarball for distroless images"
+LABEL org.opencontainers.image.description="This image is used to build tarballs for distroless images"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 

org/base/distroless-builder/README.md

@@ -0,0 +1,3 @@
+ALT dockerfile for distroless-builder image.
+
+This image is used to build tarballs for distroless images.

org/base/distroless-builder/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "apt-repo --version"

org/base/distroless-devel/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "ss -V"

org/base/distroless-gotop/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: ""
+command: "--version"

org/base/distroless-true/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: ""
+command: "true"

org/base/trivy/Dockerfile.template

@@ -0,0 +1,13 @@
+FROM {{ registry }}{{ alt_image }}:{{ branch }}
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="trivy"
+LABEL org.opencontainers.image.description="A Fast Vulnerability Scanner for Containers"
+LABEL org.opencontainers.image.source="https://aquasecurity.github.io/trivy"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("trivy") }}
+
+ENTRYPOINT [ "trivy" ]

org/base/trivy/README.md

@@ -0,0 +1,10 @@
+dockerfiles-alt-trivy
+=====================
+
+ALT dockerfile for trivy.
+
+Copy dockerfile somewhere and built the image:
+`$ docker build --rm -t <username>/trivy .`
+
+And launch the trivy container
+`$ docker run -it <username>/trivy`

org/base/trivy/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "trivy --version"

org/cert-manager/cert-manager-cainjector/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "cainjector --help"

org/cert-manager/cert-manager-controller/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "controller --help"

org/cert-manager/cert-manager-webhook/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "webhook --help"

org/flannel/flannel-cni-plugin/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: ""
+command: "flannel"

org/flannel/flannel/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "flanneld --version"

org/k8s/cert-manager-cainjector/test

@@ -1 +0,0 @@
-cainjector --help

org/k8s/cert-manager-controller/test

@@ -1 +0,0 @@
-controller --help

org/k8s/cert-manager-webhook/test

@@ -1 +0,0 @@
-webhook --help

org/k8s/coredns/test

@@ -1 +0,0 @@
-coredns --version

org/k8s/coredns/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "coredns --version"

org/k8s/etcd/test

@@ -1 +0,0 @@
-etcd --version

org/k8s/etcd/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "etcd --version"

org/k8s/flannel/test

@@ -1 +0,0 @@
-flanneld --version

org/k8s/kube-apiserver/test

@@ -1 +0,0 @@
-kube-apiserver --version

org/k8s/kube-apiserver/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-apiserver --version"

org/k8s/kube-controller-manager/test

@@ -1 +0,0 @@
-kube-controller-manager --version

org/k8s/kube-controller-manager/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-controller-manager --version"

org/k8s/kube-proxy/test

@@ -1 +0,0 @@
-kube-proxy --version

org/k8s/kube-proxy/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-proxy --version"

org/k8s/kube-scheduler/test

@@ -1 +0,0 @@
-kube-scheduler --version

org/k8s/kube-scheduler/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-scheduler --version"

org/k8s/pause/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/pause"
+command: "-v"

org/k8s/trivy-node-collector/test

@@ -1 +0,0 @@
-node-collector --help

org/k8s/trivy-node-collector/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "node-collector --help"

org/other/apache2/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "apachectl -v"

org/other/etcd/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "etcdctl version"

org/other/gitea/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "gitea --version"

org/other/nginx/test.yaml

@@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "nginx -v"