change branches p*/c* workflow for new struct

change org struct, change type of tests
delete arches ppc64le arm from building script
2024-05-21 17:51:25 +03:00 · 2024-05-21 17:39:54 +03:00 · 2024-05-08 18:20:50 +03:00 · 2024-05-08 17:08:59 +03:00 · 2024-05-08 09:27:55 +03:00 · 2024-05-03 13:05:11 +03:00
131 changed files with 434 additions and 146 deletions
--- a/.gitea/workflows/testscript
+++ b/.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
--- a/.gitea/workflows/wf_full_p10.yaml
+++ b/.gitea/workflows/wf_full_p10.yaml
@ -0,0 +1,142 @@
+name: Full building alt images
+on:
+  push:
+    tags:
+      - '*_*'
+    tags-ignore:
+      - '*_k8s'
+      - 'sisyphus_*'
+
+jobs:
+  build-process:
+    runs-on: alt-p10
+    outputs:
+      branch: ${{ env.BRANCH }}
+      org: ${{ env.ORG }}
+      url: ${{ env.URL }}
+      repo: ${{ env.REPO }}
+      buildres: ${{ steps.build-script.outcome }}
+    steps:
+      - name: Check workspace
+        run: |
+          repourl=$(echo $GU | cut -d '/' -f 3)
+          echo "URL=$repourl" >> ${GITHUB_ENV}
+          echo $repourl
+          reponame=$(echo $GR | cut -d '/' -f 1)
+          echo "REPO=$reponame" >> ${GITHUB_ENV}
+          echo $reponame
+        env:
+          GU: ${{ gitea.server_url }}
+          GR: ${{ gitea.repository }}
+      - name: Set repo for c10f2 (Temporary)
+        if: ${{ contains(github.ref_name, 'c10f2') }}
+        run: |
+          echo "event tag=${{ github.ref_name }}" 
+          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
+          echo "cat /etc/hosts"
+          cat /etc/hosts
+      - name: Update apt
+        uses: actions/init-alt-env@v1
+      - name: Install requires
+        run: |
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 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 standart building script
+        id: build-script
+        run: |
+          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:
+          ORG: ${{ env.ORG }}
+          BR: ${{ env.BRANCH }}
+        continue-on-error: true
+      - name: Send notification if build crashed
+        if: ${{ steps.build-script.outcome != 'success' }}
+        run: |
+          issueid=1
+          body="Building images finish with some errors."
+          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
+          echo "notification about test error is sent to issue $issueid"
+        env:
+          T: ${{ secrets.TOKEN }}
+          BR: ${{ env.BRANCH }}
+          URL: ${{ gitea.server_url }}
+          REPO: ${{ env.REPO }}
+      - name: Delete event tag
+        run: |
+          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
+          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
+          echo "tag $tagname is deleted"                    
+        env:
+          T: ${{ secrets.TOKEN }}
+          BR: ${{ env.BRANCH }}
+          URL: ${{ gitea.server_url }}
+          REPO: ${{ env.REPO }}
+          EV: ${{ toJson(gitea.event) }}
+  test-process:
+    needs: build-process
+    if: ${{ needs.build-process.outputs.buildres == 'success' }}
+    runs-on: alt-p10
+    steps:
+      - name: Update apt
+        uses: actions/init-alt-env@v1
+      - name: Install requires
+        run: |
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah 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: 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: |
+          $WS/.gitea/workflows/testscript $BR $ORG $URL $REPO $WS
+          cat haserr.log >> ${GITHUB_ENV}
+          echo "test process finished"
+        env:
+          BR: ${{ needs.build-process.outputs.branch }}
+          ORG: ${{ needs.build-process.outputs.org }}
+          URL: ${{ needs.build-process.outputs.url }}
+          REPO: ${{ needs.build-process.outputs.repo }}
+          WS: ${{ gitea.workspace }}
+      - name: Send notification if test crashed
+        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
+        run: |
+          issueid=1
+          errors=$(cat errors.log)
+          body="Testing images finish with some errors. $errors"
+          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
+          echo "notification about test error is sent to issue $issueid"
+        env:
+          T: ${{ secrets.TOKEN }}
+          BR: ${{ needs.build-process.outputs.branch }}
+          URL: ${{ gitea.server_url }}
+          REPO: ${{ needs.build-process.outputs.repo }}
--- a/.gitea/workflows/wf_full_sis.yaml
+++ b/.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
@ -66,12 +65,10 @@ jobs:
      - name: Send notification if build crashed
        if: ${{ steps.build-script.outcome != 'success' }}
        run: |
-          issueid=$(curl -X 'GET' "$URL/api/v1/repos/$REPO/image-forge/issues?state=open&labels=building&type=issues&page=1&limit=1&token=$T" -H 'accept: application/json' -s | jq '.[].number' -r)
-          if [[ $issueid != '' ]]; then \
-            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"; \
-          else echo "no issue to send notification"; fi
+          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 }}
@ -117,13 +114,11 @@ jobs:
      - name: Send notification if test crashed
        if: ${{ env.ERR == 'true' || steps.test-script.outcome == 'failure' }}
        run: |
-          issueid=$(curl -X 'GET' "$URL/api/v1/repos/$REPO/image-forge/issues?state=open&labels=building&type=issues&page=1&limit=1&token=$T" -H 'accept: application/json' -s | jq '.[].number' -r)
-          if [[ $issueid != '' ]]; then \
-            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"; \
-          else echo "no issue to send notification"; fi               
+          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 }}
--- a/build.py
+++ b/build.py
@ -225,7 +225,7 @@ class DockerBuilder:
        self,
        template: str,
        organization: str,
-        install_pakages=None,
+        install_packages=None,
        **kwargs,
    ) -> str:
        if self.registry:
@ -237,7 +237,7 @@ class DockerBuilder:
        rendered = Template(template).render(
            alt_image=alt_image,
            branch=self.branch,
-            install_pakages=install_pakages,
+            install_packages=install_packages,
            organization=organization,
            registry=registry,
            **kwargs,
@ -247,7 +247,7 @@ class DockerBuilder:

    @forall_images(consume_result=True)
    def render_dockerfiles(self, **kwargs):
-        def install_pakages(*names):
+        def install_packages(*names):
            tasks = self.tasks.get(self.branch, kwargs["image"])
            linux32 = '$([ "$(rpm --eval %_host_cpu)" = i586 ] && echo linux32)'
            if tasks:
@ -273,7 +273,7 @@ class DockerBuilder:
            rendered = self.render_template(
                dockerfile_template.read_text(),
                self.overwrite_organization,
-                install_pakages,
+                install_packages,
            )
            kwargs["dockerfile"].write_text(rendered + "\n")

@ -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"]
+    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]
@ -654,7 +654,8 @@ def parse_args():
        nargs="+",
        default=images,
        choices=images,
-        help="list of branches",
+        metavar="IMAGE_NAME",
+        help="list of images to build",
    )
    images_group.add_argument(
        "-o",
@ -664,6 +665,14 @@ def parse_args():
        choices=organizations,
        help="build all images from these organizations",
    )
+    parser.add_argument(
+        "--skip-images",
+        nargs="+",
+        default=[],
+        choices=images,
+        metavar="IMAGE_NAME",
+        help="list of images to skip",
+    )
    parser.add_argument(
        "-r",
        "--registry",
@ -696,27 +705,20 @@ def parse_args():
    parser.add_argument(
        "--sign",
    )
-    parser.add_argument(
-        "--skip-images",
-        nargs="+",
-        default=[],
-        choices=images,
-        help="list of skipping images",
-    )
    parser.add_argument(
        "-a",
        "--arches",
        nargs="+",
        default=arches,
        choices=arches,
-        help="list of arches",
+        help="build images for these architectures",
    )
    parser.add_argument(
        "--skip-arches",
        nargs="+",
        default=[],
        choices=arches,
-        help="list of skipping arches",
+        help="list of architectures to skip",
    )
    parser.add_argument(
        "-b",
@ -724,28 +726,28 @@ def parse_args():
        nargs="+",
        default=branches,
        choices=branches,
-        help="list of branches",
+        help="build images for these branches",
    )
    parser.add_argument(
        "--skip-branches",
        nargs="+",
        default=[],
        choices=branches,
-        help="list of skipping branches",
+        help="list of branches to skip",
    )
    parser.add_argument(
        "--stages",
        nargs="+",
        default=stages,
        choices=stages,
-        help="list of stages",
+        help="list of stages to go through",
    )
    parser.add_argument(
        "--skip-stages",
        nargs="+",
        default=[],
        choices=stages,
-        help="list of skipping stages",
+        help="list of stages to skip",
    )
    args = parser.parse_args()

--- a/org/alt/apache2/test
+++ b/org/alt/apache2/test
@ -1 +0,0 @@
-apachectl -v
--- a/org/alt/base/test
+++ b/org/alt/base/test
@ -1 +0,0 @@
-LC_ALL=ru_RU.UTF-8 TZ=/usr/share/zoneinfo/Europe/Moscow date| grep MSK
--- a/org/alt/buildpack-deps-curl/test
+++ b/org/alt/buildpack-deps-curl/test
@ -1 +0,0 @@
-curl --version && gpg --version
--- a/org/alt/buildpack-deps-scm/test
+++ b/org/alt/buildpack-deps-scm/test
@ -1 +0,0 @@
-git --version && hg --version
--- a/org/alt/buildpack-deps/test
+++ b/org/alt/buildpack-deps/test
@ -1 +0,0 @@
-gcc --version && make --version
--- a/org/alt/distroless-builder/README.md
+++ b/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.
--- a/org/alt/distroless-builder/test
+++ b/org/alt/distroless-builder/test
@ -1 +0,0 @@
-apt-repo --version
--- a/org/alt/distroless-devel/test
+++ b/org/alt/distroless-devel/test
@ -1 +0,0 @@
-ss -V
--- a/org/alt/etcd/test
+++ b/org/alt/etcd/test
@ -1 +0,0 @@
-etcdctl version
--- a/org/alt/gitea/test
+++ b/org/alt/gitea/test
@ -1 +0,0 @@
-gitea --version
--- a/org/alt/nginx/test
+++ b/org/alt/nginx/test
@ -1 +0,0 @@
-nginx -v
--- a/org/alt/node/test
+++ b/org/alt/node/test
@ -1 +0,0 @@
-node -v
--- a/org/alt/prometheus/test
+++ b/org/alt/prometheus/test
@ -1 +0,0 @@
-prometheus --version
--- a/org/alt/python/test
+++ b/org/alt/python/test
@ -1 +0,0 @@
-python3 --version
--- a/org/alt/registry/test
+++ b/org/alt/registry/test
@ -1 +0,0 @@
-registry --version
--- a/org/alt/ruby/test
+++ b/org/alt/ruby/test
@ -1 +0,0 @@
-ruby --version
--- a/org/alt/systemd/test
+++ b/org/alt/systemd/test
@ -1 +0,0 @@
-ls -la /sbin/init | grep systemd
--- a/org/alt/unit/test
+++ b/org/alt/unit/test
@ -1 +0,0 @@
-unitd --version
--- a/org/base/base/Dockerfile.template
+++ b/org/base/base/Dockerfile.template
@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
+{{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}

 CMD ["bash"]
--- a/org/base/base/README.md
+++ b/org/base/base/README.md
--- a/org/base/base/test.yaml
+++ b/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"
--- a/org/base/buildpack-deps-curl/Dockerfile.template
+++ b/org/base/buildpack-deps-curl/Dockerfile.template
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-curl"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "ca-certificates",
    "curl",
    "gnupg",
--- a/org/base/buildpack-deps-curl/test.yaml
+++ b/org/base/buildpack-deps-curl/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "curl --version && gpg --version"
--- a/org/base/buildpack-deps-scm/Dockerfile.template
+++ b/org/base/buildpack-deps-scm/Dockerfile.template
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-scm"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "git",
    "mercurial",
    "openssh-clients",
--- a/org/base/buildpack-deps-scm/test.yaml
+++ b/org/base/buildpack-deps-scm/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "git --version && hg --version"
--- a/org/base/buildpack-deps/Dockerfile.template
+++ b/org/base/buildpack-deps/Dockerfile.template
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "ImageMagick",
    "autoconf",
    "automake",
--- a/org/base/buildpack-deps/test.yaml
+++ b/org/base/buildpack-deps/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "gcc --version && make --version"
--- a/org/base/devel/Dockerfile.template
+++ b/org/base/devel/Dockerfile.template
@ -8,27 +8,27 @@ LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

 # install editor
-{{ install_pakages("vim-console") }}
+{{ install_packages("vim-console") }}

 # install debugging tools
-{{ install_pakages("strace", "gdb") }}
+{{ install_packages("strace", "gdb") }}

 # install document viewers
-{{ install_pakages("man") }}
+{{ install_packages("man") }}

 # install version control system
-{{ install_pakages("git-core", "perl-Git") }}
+{{ install_packages("git-core", "perl-Git") }}

 # install network utils
-{{ install_pakages("iproute2", "iputils", "wget", "curl") }}
+{{ install_packages("iproute2", "iputils", "wget", "curl") }}

 # install file utils
-{{ install_pakages("lsof", "ripgrep") }}
+{{ install_packages("lsof", "ripgrep") }}

 # install shell and completions
-{{ install_pakages("zsh", "zsh-completions") }}
+{{ install_packages("zsh", "zsh-completions") }}

 # install compilation utils
-{{ install_pakages("make", "gcc", "gcc-c++") }}
+{{ install_packages("make", "gcc", "gcc-c++") }}

 CMD ["zsh"]
--- a/org/base/devel/README.md
+++ b/org/base/devel/README.md
--- a/org/base/devel/test.yaml
+++ b/org/base/devel/test.yaml
--- a/org/base/distroless-base/README.md
+++ b/org/base/distroless-base/README.md
--- a/org/base/distroless-base/distroless.toml
+++ b/org/base/distroless-base/distroless.toml
--- a/org/base/distroless-builder/Dockerfile.template
+++ b/org/base/distroless-builder/Dockerfile.template
@ -3,13 +3,13 @@ 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"

 RUN echo %_excludedocs 1 >> /etc/rpm/macros
 RUN rpm -qalds | awk '/^normal/{print $2}' | xargs rm -rf
-{{ install_pakages("python3", "glibc-utils", "apt-repo") }}
+{{ install_packages("python3", "glibc-utils", "apt-repo") }}
 WORKDIR /usr/src/distroless
 RUN mkdir file-lists
 RUN useradd -m nonroot
--- a/org/base/distroless-builder/README.md
+++ b/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.
--- a/org/base/distroless-builder/distroless-builder.py
+++ b/org/base/distroless-builder/distroless-builder.py
--- a/org/base/distroless-builder/test.yaml
+++ b/org/base/distroless-builder/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "apt-repo --version"
--- a/org/base/distroless-devel/README.md
+++ b/org/base/distroless-devel/README.md
--- a/org/base/distroless-devel/distroless.toml
+++ b/org/base/distroless-devel/distroless.toml
--- a/org/base/distroless-devel/test.yaml
+++ b/org/base/distroless-devel/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "ss -V"
--- a/org/base/distroless-gotop/README.md
+++ b/org/base/distroless-gotop/README.md
--- a/org/base/distroless-gotop/distroless.toml
+++ b/org/base/distroless-gotop/distroless.toml
--- a/org/base/distroless-gotop/test.yaml
+++ b/org/base/distroless-gotop/test.yaml
@ -0,0 +1,2 @@
+entrypoint: ""
+command: "--version"
--- a/org/base/distroless-static/README.md
+++ b/org/base/distroless-static/README.md
--- a/org/base/distroless-static/distroless.toml
+++ b/org/base/distroless-static/distroless.toml
--- a/org/base/distroless-static/static.list
+++ b/org/base/distroless-static/static.list
--- a/org/base/distroless-true/README.md
+++ b/org/base/distroless-true/README.md
--- a/org/base/distroless-true/distroless.toml
+++ b/org/base/distroless-true/distroless.toml
--- a/org/base/distroless-true/test.yaml
+++ b/org/base/distroless-true/test.yaml
@ -0,0 +1,2 @@
+entrypoint: ""
+command: "true"
--- a/org/base/trivy/Dockerfile.template
+++ b/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" ]
--- a/org/base/trivy/README.md
+++ b/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`
--- a/org/base/trivy/test.yaml
+++ b/org/base/trivy/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "trivy --version"
--- a/org/cert-manager/cert-manager-cainjector/Dockerfile.template
+++ b/org/cert-manager/cert-manager-cainjector/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/cert-manager/cert-manager-cainjector/test.yaml
+++ b/org/cert-manager/cert-manager-cainjector/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "cainjector --help"
--- a/org/cert-manager/cert-manager-controller/Dockerfile.template
+++ b/org/cert-manager/cert-manager-controller/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/cert-manager/cert-manager-controller/test.yaml
+++ b/org/cert-manager/cert-manager-controller/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "controller --help"
--- a/org/cert-manager/cert-manager-webhook/Dockerfile.template
+++ b/org/cert-manager/cert-manager-webhook/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/cert-manager/cert-manager-webhook/test.yaml
+++ b/org/cert-manager/cert-manager-webhook/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "webhook --help"
--- a/org/flannel/flannel-cni-plugin/Dockerfile.template
+++ b/org/flannel/flannel-cni-plugin/Dockerfile.template
@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/flannel-io/cni-plugin"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

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

 RUN cp /usr/libexec/cni/flannel /flannel
--- a/org/flannel/flannel-cni-plugin/test.yaml
+++ b/org/flannel/flannel-cni-plugin/test.yaml
@ -0,0 +1,2 @@
+entrypoint: ""
+command: "flannel"
--- a/org/flannel/flannel/Dockerfile.template
+++ b/org/flannel/flannel/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/flannel-io/flannel"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "iproute2",
    "net-tools",
    "ca-certificates",
--- a/org/flannel/flannel/test.yaml
+++ b/org/flannel/flannel/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "flanneld --version"
--- a/org/k8s/cert-manager-cainjector/test
+++ b/org/k8s/cert-manager-cainjector/test
@ -1 +0,0 @@
-cainjector --help
--- a/org/k8s/cert-manager-controller/test
+++ b/org/k8s/cert-manager-controller/test
@ -1 +0,0 @@
-controller --help
--- a/org/k8s/cert-manager-webhook/test
+++ b/org/k8s/cert-manager-webhook/test
@ -1 +0,0 @@
-webhook --help
--- a/org/k8s/coredns/Dockerfile.template
+++ b/org/k8s/coredns/Dockerfile.template
@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/coredns/coredns"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("coredns") }}
+{{ install_packages("coredns") }}

 ENTRYPOINT ["/usr/bin/coredns"]
--- a/org/k8s/coredns/test
+++ b/org/k8s/coredns/test
@ -1 +0,0 @@
-coredns --version
--- a/org/k8s/coredns/test.yaml
+++ b/org/k8s/coredns/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "coredns --version"
--- a/org/k8s/etcd/Dockerfile.template
+++ b/org/k8s/etcd/Dockerfile.template
@ -8,7 +8,7 @@ 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_pakages("etcd") }}
+{{ install_packages("etcd") }}

 VOLUME /data

--- a/org/k8s/etcd/test
+++ b/org/k8s/etcd/test
@ -1 +0,0 @@
-etcd --version
--- a/org/k8s/etcd/test.yaml
+++ b/org/k8s/etcd/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "etcd --version"
--- a/org/k8s/flannel/test
+++ b/org/k8s/flannel/test
@ -1 +0,0 @@
-flanneld --version
--- a/org/k8s/kube-apiserver/Dockerfile.template
+++ b/org/k8s/kube-apiserver/Dockerfile.template
@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-master") }}
+LABEL org.opencontainers.image.title="kube-apiserver"
+LABEL org.opencontainers.image.description="The Kubernetes API server validates and configures data for the api objects which include pods, services, replicationcontrollers, and others."
+LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-apiserver"]
--- a/org/k8s/kube-apiserver/test
+++ b/org/k8s/kube-apiserver/test
@ -1 +0,0 @@
-kube-apiserver --version
--- a/org/k8s/kube-apiserver/test.yaml
+++ b/org/k8s/kube-apiserver/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-apiserver --version"
--- a/org/k8s/kube-controller-manager/Dockerfile.template
+++ b/org/k8s/kube-controller-manager/Dockerfile.template
@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-master") }}
+LABEL org.opencontainers.image.title="kube-controller-manager"
+LABEL org.opencontainers.image.description="The Kubernetes controller manager is a daemon that embeds the core control loops shipped with Kubernetes."
+LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-controller-manager"]
--- a/org/k8s/kube-controller-manager/test
+++ b/org/k8s/kube-controller-manager/test
@ -1 +0,0 @@
-kube-controller-manager --version
--- a/org/k8s/kube-controller-manager/test.yaml
+++ b/org/k8s/kube-controller-manager/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-controller-manager --version"
--- a/org/k8s/kube-proxy/Dockerfile.template
+++ b/org/k8s/kube-proxy/Dockerfile.template
@ -2,7 +2,13 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-node") }}
+LABEL org.opencontainers.image.title="kube-proxy"
+LABEL org.opencontainers.image.description="The Kubernetes network proxy runs on each node."
+LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("kubernetes-node") }}

 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy

--- a/org/k8s/kube-proxy/test
+++ b/org/k8s/kube-proxy/test
@ -1 +0,0 @@
-kube-proxy --version
--- a/org/k8s/kube-proxy/test.yaml
+++ b/org/k8s/kube-proxy/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-proxy --version"
--- a/org/k8s/kube-scheduler/Dockerfile.template
+++ b/org/k8s/kube-scheduler/Dockerfile.template
@ -2,6 +2,12 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-master") }}
+LABEL org.opencontainers.image.title="kube-scheduler"
+LABEL org.opencontainers.image.description="The Kubernetes scheduler is a control plane process which assigns Pods to Nodes."
+LABEL org.opencontainers.image.source="https://github.com/kubernetes/kubernetes"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-scheduler"]
--- a/org/k8s/kube-scheduler/test
+++ b/org/k8s/kube-scheduler/test
@ -1 +0,0 @@
-kube-scheduler --version
--- a/org/k8s/kube-scheduler/test.yaml
+++ b/org/k8s/kube-scheduler/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "kube-scheduler --version"
--- a/org/k8s/pause/Dockerfile.template
+++ b/org/k8s/pause/Dockerfile.template
@ -1,6 +1,6 @@
 FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer

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

 FROM scratch

--- a/org/k8s/pause/test.yaml
+++ b/org/k8s/pause/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/pause"
+command: "-v"
--- a/org/k8s/trivy-node-collector/Dockerfile.template
+++ b/org/k8s/trivy-node-collector/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/aquasecurity/k8s-node-
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "k8s-trivy-node-collector"
 ) }}

--- a/org/k8s/trivy-node-collector/test
+++ b/org/k8s/trivy-node-collector/test
@ -1 +0,0 @@
-node-collector --help
--- a/org/k8s/trivy-node-collector/test.yaml
+++ b/org/k8s/trivy-node-collector/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "node-collector --help"
--- a/org/other/apache2/Dockerfile.template
+++ b/org/other/apache2/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="http://httpd.apache.org"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("apache2") }}
+{{ install_packages("apache2") }}

 EXPOSE 80

--- a/org/other/apache2/README.md
+++ b/org/other/apache2/README.md
--- a/org/other/apache2/test.yaml
+++ b/org/other/apache2/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "apachectl -v"
--- a/org/other/etcd/Dockerfile.template
+++ b/org/other/etcd/Dockerfile.template
@ -8,7 +8,7 @@ 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_pakages("etcd") }}
+{{ install_packages("etcd") }}

 VOLUME /data

--- a/org/other/etcd/README.md
+++ b/org/other/etcd/README.md
--- a/org/other/etcd/test.yaml
+++ b/org/other/etcd/test.yaml
@ -0,0 +1,2 @@
+entrypoint: "/bin/sh"
+command: "etcdctl version"
--- a/org/other/gitea/Dockerfile.template
+++ b/org/other/gitea/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/go-gitea/gitea"
 LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("gitea", "openssh-server", "gosu") }}
+{{ install_packages("gitea", "openssh-server", "gosu") }}

 ENV USER gitea
 ENV HOME /var/lib/gitea
--- a/org/other/gitea/README.md
+++ b/org/other/gitea/README.md
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nadezhda Fedorova	9c460b363e	change branches p/c workflow for new struct	2024-05-21 17:51:25 +03:00
Nadezhda Fedorova	28c0fc03cf	change org struct, change type of tests	2024-05-21 17:39:54 +03:00
Nadezhda Fedorova	f8496320dd	delete arches ppc64le arm from building script All checks were successful Full building alt images / build-process (push) Successful in 1h27m19s Details Full building alt images / test-process (push) Successful in 5m33s Details	2024-05-08 18:20:50 +03:00
fl0pp5	8cdee0b278	feat: Add trivy	2024-05-08 17:08:59 +03:00
Nadezhda Fedorova	8cc6581c18	fix systemd's label Some checks failed Full building alt images / build-process (push) Failing after 1m4s Details Full building alt images / test-process (push) Has been skipped Details	2024-05-08 09:27:55 +03:00
Alexander Stepchenko	4bef9210e6	docs: fix distroless-builder description	2024-05-03 13:05:11 +03:00
Alexander Stepchenko	6944bb7158	feat: add labels to the k8s/kube-* images	2024-05-02 12:01:46 +03:00
Alexander Stepchenko	e60d4a6450	refactor: make help message more readable	2024-05-01 18:50:33 +03:00
Alexander Stepchenko	d31ae53893	fix: correct help message for -i/--images option	2024-05-01 18:49:45 +03:00
Alexander Stepchenko	d3a5f23958	feat: add zot Dockerfile.template and test	2024-04-26 16:29:36 +03:00
Alexander Stepchenko	f55f03f91d	refactor: fix typo in install_pakage	2024-04-26 12:34:41 +03:00
Nadezhda Fedorova	fa20517058	add repo to /etc/host for building c10f2 All checks were successful Full building alt images / build-process (push) Successful in 1h15m43s Details Full building alt images / test-process (push) Successful in 5m1s Details	2024-04-25 11:15:52 +03:00
Nadezhda Fedorova	ad9a468aa6	update tags for k8s Some checks failed Full building alt images / build-process (push) Failing after 1m6s Details Full building alt images / test-process (push) Has been cancelled Details	2024-04-23 17:43:14 +03:00
Nadezhda Fedorova	86fba1814f	fix getting number of tech.issue for notifications to static number 1 (filter on tag doesn't work) All checks were successful Full building alt images / build-process (push) Successful in 1h16m21s Details Full building alt images / test-process (push) Successful in 5m51s Details	2024-04-23 13:35:41 +03:00
Nadezhda Fedorova	28b280556b	delete from workflow building images on c10f1/2 for arches arm, ppc All checks were successful Full building alt images / build-process (push) Successful in 2m17s Details Full building alt images / test-process (push) Has been skipped Details	2024-04-23 13:09:37 +03:00
Nadezhda Fedorova	deee1706de	add workflow for building all images on branches p10, c10f1/2 All checks were successful Full building alt images / build-process (push) Successful in 5m55s Details Full building alt images / test-process (push) Has been skipped Details	2024-04-22 17:24:17 +03:00
Nadezhda Fedorova	a59901c4bf	add branches c10f1,c10f2 to list of options	2024-04-22 17:17:14 +03:00
				`@ -1 +0,0 @@`
				`LC_ALL=ru_RU.UTF-8 TZ=/usr/share/zoneinfo/Europe/Moscow date\| grep MSK`