test repository dispatch

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

.gitea/workflows/testscript

@@ -24,7 +24,10 @@ do
     then imgpath="$2-$1/$IM:latest"
   fi
 
-  entrypoint='/bin/sh'
+  entrypoint='/usr/bin/sh'
+  if [[ $1 == 'p10' ]]
+    then entrypoint='/bin/sh'
+  fi
 
   command="echo empty_command"
   if [[ $test != '' ]]; then

.gitea/workflows/wf_single.yaml

@@ -26,13 +26,6 @@ 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
@@ -61,10 +54,7 @@ jobs:
           echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
           localimage=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
           echo "IMAGE=$localimage" >> ${GITHUB_ENV}                              
-          echo "IMAGE=$localimage"
+          echo "IMAGE=$localimage"          
-          org=$(echo "$localimage" | cut -d '/' -f 1)
-          echo "ORG=$org" >> ${GITHUB_ENV}
-          echo "ORG=$org"
       - name: Get test for image
         run: |
           if test -f ${{ gitea.workspace }}/org/$IM/test; then testscript=$(cat ${{ gitea.workspace }}/org/$IM/test); else testscript=""; fi
@@ -75,13 +65,11 @@ jobs:
       - name: Run building script
         id: build-script
         run: |
-          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--tags=tags.toml --overwrite-organization $ORG-$BR"; else k8sarg=""; fi
           echo "build.py -i $IM -b $BR"
-          ${{ gitea.workspace }}/build.py -i $IM -b $BR $k8sarg        
+          ${{ gitea.workspace }}/build.py -i $IM -b $BR          
         env:
           IM: ${{ env.IMAGE }}
           BR: ${{ env.BRANCH }}
-          ORG: ${{ env.ORG }}
         continue-on-error: true
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}
@@ -123,7 +111,7 @@ jobs:
         if: ${{ needs.build-process.outputs.test != '' }}
         continue-on-error: true
         run: |
-          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
+          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
         env:                
           IM: ${{ needs.build-process.outputs.image }} 
           BR: ${{ needs.build-process.outputs.branch }}

.gitea/workflows/wf_single_dispatch.yaml

@@ -0,0 +1,14 @@
+name: Test repository dispatch
+on:
+  repository_dispatch:
+    types: [build-single-image]
+
+jobs:
+  test-repository-dispatch:
+    runs-on: alt-sisyphus
+    steps:
+      - name: Print debug message
+        run: |
+          echo $MESSAGE
+        env:
+          MESSAGE: ${{ gitea.event.client_payload.message }}

image-build

@@ -0,0 +1,267 @@
+#!/bin/sh
+
+set -uo pipefail
+
+PROG='image-build'
+HELP_MSG="$(cat <<EOF
+$PROG - build an OCI image from a package
+
+Usage: $PROG [options] <image name> <package name>
+
+Options:
+  -b <branch>		package repository branch
+  -r <registry>		OCI destination registry
+  -t <task id>		task id
+  --latest		also tag this image as latest
+  --push		push the image to the registry after build
+  --skip-build		if push is true, then skip the build stage
+  --dry-run		only print what would be done
+  --prefix <prefix>	image name prefix
+  --help		show this text and exit
+
+Notes:
+  The image is only pushed to the destination registry
+  if the option --push is present.
+EOF
+)"
+
+function show_help() {
+	printf '%s' "$HELP_MSG"
+	exit
+}
+
+function show_usage() {
+	echo "$PROG: $1" >&2
+	echo "Try \`image-build --help' for more information." >&2
+	exit 1
+}
+
+TEMP="$(getopt -n "$PROG" -o b:r:t: -l help,latest,push,skip-build,dry-run,prefix:: -- "$@")" || show_usage ""
+
+eval set -- "$TEMP"
+
+branch='sisyphus'
+registry='registry.altlinux.org'
+task_id=
+latest=
+push=
+skip_build=
+dry_run=
+prefix=
+while :; do
+	case "$1" in
+		--) shift; break ;;
+		-b) shift; branch="$1" ;;
+		-r) shift; registry="$1" ;;
+		-t) shift; task_id="$1" ;;
+		--latest) latest="1" ;;
+		--push) push="1" ;;
+		--skip-build) skip_build="1" ;;
+		--dry-run) dry_run="1" ;;
+		--prefix) shift; prefix="$1" ;;
+		-h|--help) show_help ;;
+		*) show_usage "unrecognized option: $1" ;;
+	esac
+	shift
+done
+
+[ "$#" -ge 2 ] || show_usage "not enough arguments"
+
+image="$1"
+package="$2"
+
+declare -A package_urls
+package_urls["c10f2"]="http://update.altsp.su/pub/distributions/ALTLinux/c10f2/branch/files/x86_64/RPMS/"
+package_urls["p10"]="http://ftp.altlinux.org/pub/distributions/archive/p10/release/latest/files/x86_64/RPMS/"
+package_urls["sisyphus"]="http://ftp.altlinux.org/pub/distributions/archive/sisyphus/latest/files/x86_64/RPMS/"
+
+function handle_error() {
+	echo "$PROG: $1" >&2
+	exit 2
+}
+
+function get_binary_package_version() {
+	local branch="$1"
+	local package="$2"
+
+	local line;
+	line="$(curl -s "${package_urls["$branch"]}" | grep "$package")"
+	[ "$?" -eq 0 ] || handle_error "package not found: $package"
+
+	local version;
+	version="$(echo "$line" | sed -E "s/.*href=\"$package-(.+)-.+\".+/\1/")"
+	[ "$?" -eq 0 ] || handle_error "package version not found: $package"
+
+	echo "$version"
+}
+
+function api_get_source_package_version() {
+	local branch="$1"
+	local package="$2"
+
+	local version;
+	version="$(curl -s "https://rdb.altlinux.org/api/site/package_versions_from_tasks?branch=$branch&name=$package" | jq -e -r '.versions[0].version')"
+	[ "$?" -eq 0 ] || handle_error "error getting package version: no package $package for branch $branch"
+
+	echo "$version"
+}
+
+function api_get_source_package_version_from_task() {
+	local task_id="$1"
+	local package="$2"
+
+	local version;
+	version="$(curl -s "https://rdb.altlinux.org/api/task/packages/$task_id" | jq -e -r --arg package "$package" '.subtasks[].source | select(.name == $package).version')"
+	[ "$?" -eq 0 ] || handle_error "error getting package version: no package $package in task $task_id"
+
+	echo "$version"
+}
+
+
+case "$image" in
+	'coredns' | \
+	'etcd' | \
+	'flannel' | \
+	'flannel-cni-plugin' | \
+	'pause' | \
+	'cert-manager-acmesolver' | \
+	'cert-manager-cainjector' | \
+	'cert-manager-controller' | \
+	'cert-manager-startupapicheck' | \
+	'cert-manager-webhook')
+		image="k8s/$image"
+
+		version=
+		additional_options=
+
+		if [ -n "$task_id" ]; then
+			version="$(api_get_source_package_version_from_task "$task_id" "$package")"
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, task: $task_id"
+
+			tasks_file='/tmp/k8s-tasks.toml'
+			jq --null-input --arg branch "$branch" --arg task_id "$task_id" --arg image "$image" '{
+				$branch: {$task_id: [$image]},
+			}' | dasel -r json -w toml > "$tasks_file"
+
+			additional_options+="--tasks $tasks_file "
+		else
+			# temporary, why does rdb return 'not found'?
+			case "$image" in
+				'k8s/pause')
+					version='3.9'
+					;;
+				*)
+					version="$(api_get_source_package_version "$branch" "$package")"
+					[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, branch: $branch"
+					;;
+			esac
+		fi
+
+		tags_file="/tmp/k8s-tags.toml"
+		case "$image" in
+			'k8s/flannel-cni-plugin')
+				# up to the last number in version
+				flannel_version="${version%.*}"
+				# the last number in version
+				flannel_release="${version##*.}"
+				jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$flannel_version-flannel$flannel_release" '{
+					$image: {$branch: [$version]},
+				}' | dasel -r json -w toml > "$tags_file"
+				;;
+			'k8s/etcd')
+				jq --null-input --arg image "$image" --arg branch "$branch" --arg version "$version-0" '{
+					$image: {$branch: [$version]},
+				}' | dasel -r json -w toml > "$tags_file"
+				;;
+			'k8s/pause')
+				jq --null-input --arg image "$image" --arg branch "$branch" --arg version "$version" '{
+					$image: {$branch: [$version]},
+				}' | dasel -r json -w toml > "$tags_file"
+				;;
+			*)
+				jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$version" '{
+					$image: {$branch: [$version]},
+				}' | dasel -r json -w toml > "$tags_file"
+				;;
+		esac
+
+		if [ -n "$latest" ]; then
+			additional_options+="--latest $branch "
+		fi
+
+		if [ -z "$push" ]; then
+			additional_options+='--skip-stages push '
+		elif [ -n "$skip_build" ]; then
+			additional_options+='--stages push '
+		fi
+
+		if [ -n "$dry_run" ]; then
+			additional_options+='--dry-run '
+		fi
+
+		./build.py \
+			--branch "$branch" \
+			--registry "$registry" \
+			--overwrite-organization "$prefix" \
+			--images "$image" \
+			--tags "$tags_file" \
+			$additional_options
+		;;
+	'kube-apiserver' | 'kube-controller-manager' | 'kube-scheduler' | 'kube-proxy')
+		image="k8s/$image"
+
+		version=
+		additional_options=
+
+		if [ -n "$task_id" ]; then
+			version="$(api_get_source_package_version_from_task "$task_id" "$package")"
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, task: $task_id"
+
+			tasks_file='/tmp/k8s-tasks.toml'
+			jq --null-input --arg branch "$branch" --arg task_id "$task_id" --arg image "$image" '{
+				$branch: {$task_id: [$image]},
+			}' | dasel -r json -w toml > "$tasks_file"
+
+			additional_options+="--tasks $tasks_file "
+		else
+			version="$(api_get_source_package_version "$branch" "$package")"
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, branch: $branch"
+		fi
+
+		# if binary package
+		#version_str="$(echo "$package" | sed -E 's/kubernetes(.+)-.+/\1/')"
+		#[ "$?" -eq 0 ] || handle_error "error getting specified rpm package version: $package"
+
+		# if source package
+		version_str="$(echo "$package" | sed -E 's/kubernetes(.+)/\1/')"
+		[ "$?" -eq 0 ] || handle_error "error getting specified rpm package version: $package"
+
+		tags_file="/tmp/k8s-tags.toml"
+		jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$version" '{
+			$image: {$branch: [$version]},
+		}' | dasel -r json -w toml > "$tags_file"
+
+		if [ -n "$latest" ]; then
+			additional_options+="--latest $branch "
+		fi
+
+		if [ -z "$push" ]; then
+			additional_options+="--skip-stages push "
+		elif [ -n "$skip_build" ]; then
+			additional_options+="--stages push "
+		fi
+
+		if [ -n "$dry_run" ]; then
+			additional_options+="--dry-run "
+		fi
+
+		./build.py \
+			--branch "$branch" \
+			--registry "$registry" \
+			--overwrite-organization "$prefix" \
+			--images "$image" \
+			--tags "$tags_file" \
+			--package-version "$version_str" \
+			$additional_options
+		;;
+esac

image-build.md

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

image-build.py

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

images-info.toml

@@ -5,4 +5,4 @@ skip-branches = [ "p9" ]
 skip-arches = [ "386" ]
 
 ["alt/ansible"]
-skip-branches = [ "c10f2", "c10f1", "p10" ]
+skip-arches = [ "c10f2", "c10f1" ]

org/k8s/coredns/Dockerfile.template

@@ -8,8 +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"
 
-ARG PKG_VERSION
+{{ install_packages("coredns") }}
-
-{{ install_packages("coredns${PKG_VERSION}") }}
 
 ENTRYPOINT ["/usr/bin/coredns"]

org/k8s/trivy-node-collector/Dockerfile.template

@@ -9,8 +9,7 @@ LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
 {{ install_packages(
-    "k8s-trivy-node-collector",
+    "k8s-trivy-node-collector"
-    "procps"
 ) }}
 
 RUN ln -s /usr/bin/k8s-trivy-node-collector /usr/bin/node-collector

tags.toml

@@ -82,7 +82,6 @@ c10f2 = [ "v1.1.2" ]
 
 ["k8s/trivy-node-collector"]
 p10 = [ "0.0.9" ]
-p11 = [ "0.3.1" ]
+sisyphus = [ "0.0.9" ]
-sisyphus = [ "0.3.1" ]
 c10f1 = [ "0.0.9" ]
-c10f2 = [ "0.3.1" ]
+c10f2 = [ "0.0.9" ]