update

- 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

README.md

@@ -1,5 +1,22 @@
 # image-forge
 
+## Wrapper
+
+### Examples
+
+From the repository
+
+```shell
+image-build -b sisyphus -r registry.altlinux.org --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+```
+
+From a task
+
+```shell
+image-build -b sisyphus -r test.registry.altlinux.org -t 335250 --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+```
+
+
 ## alt images
 To build `alt` images, run:
 ```bash

build.py

@@ -15,6 +15,7 @@ from jinja2 import Template
 
 ORG_DIR = Path("org")
 
+PKG_VERSION: str = ""
 
 class Image:
     def __init__(self, canonical_name):
@@ -578,6 +579,7 @@ class DockerBuilder:
             "--force-rm",
             f"--manifest={manifest}",
             f"--platform={platforms}",
+            f'--build-arg=PKG_VERSION={PKG_VERSION}',
             ".",
         ]
         self.run(build_cmd, cwd=image.path)
@@ -749,6 +751,10 @@ def parse_args():
         choices=stages,
         help="list of stages to skip",
     )
+    parser.add_argument(
+        "--package-version",
+        help="from which package to build",
+    )
     args = parser.parse_args()
 
     args.stages = set(args.stages) - set(args.skip_stages)
@@ -760,7 +766,10 @@ def parse_args():
 
 
 def main():
+    global PKG_VERSION
+
     args = parse_args()
+    PKG_VERSION = args.package_version
     arches = args.arches
     images_info = ImagesInfo()
     tags = Tags(args.tags, args.latest)

image-build

@@ -0,0 +1,328 @@
+#!/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"
+}
+
+function string_count() {
+	local substring="$1"
+	awk -F"$substring" '{ print NF-1 }'
+}
+
+case "$image" in
+	'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
+			version="$(api_get_source_package_version "$branch" "$package")"
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, branch: $branch"
+		fi
+
+		tags_file="/tmp/k8s-tags.toml"
+		case "$image" in
+			'k8s/flannel-cni-plugin')
+				num_dots="$(echo "$version" | string_count '.')"
+				if [ "$num_dots" -eq 2 ]; then
+					jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$version-flannel1" '{
+						$image: {$branch: [$version]},
+					}' | dasel -r json -w toml > "$tags_file"
+				elif [ "$num_dots" -eq 3 ]; then
+					# 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"
+				else
+					handle_error "wrong version for package $package: $version"
+				fi
+				;;
+			'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
+		;;
+	'coredns')
+		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/coredns(.+)/\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
+		;;
+	'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

org/k8s/coredns/Dockerfile.template

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

org/k8s/kube-apiserver/Dockerfile.template

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

org/k8s/kube-controller-manager/Dockerfile.template

@@ -8,6 +8,8 @@ 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") }}
+ARG PKG_VERSION
+
+{{ install_packages("kubernetes${PKG_VERSION}-master") }}
 
 ENTRYPOINT ["/usr/bin/kube-controller-manager"]

org/k8s/kube-proxy/Dockerfile.template

@@ -8,7 +8,9 @@ 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") }}
+ARG PKG_VERSION
+
+{{ install_packages("kubernetes${PKG_VERSION}-node") }}
 
 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy
 

org/k8s/kube-scheduler/Dockerfile.template

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

scripts/build-k8s-c10f2.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -eu
+
+registry='registry.altlinux.org'
+#registry='10.4.4.52:5000'
+task_id=
+
+additional_options=
+if [ -n "$task_id" ]; then
+	additional_options="-t $task_id"
+fi
+
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.28
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.28
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.28
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.28
+
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.29
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.29
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.29
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.29
+
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.30
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.30
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.30
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.30
+
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.31
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.31
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.31
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.31
+
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 etcd etcd
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 coredns coredns1.11.1
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 coredns coredns1.11.3
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 pause kubernetes-pause
+
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 flannel flannel
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 flannel-cni-plugin cni-plugin-flannel
+
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-startupapicheck cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-acmesolver cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-cainjector cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-controller cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-webhook cert-manager

scripts/build-k8s-sisyphus.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -eu
+
+registry='registry.altlinux.org'
+#registry='10.4.4.52:5000'
+task_id=
+
+additional_options=
+if [ -n "$task_id" ]; then
+	additional_options="-t $task_id"
+fi
+
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.28
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.28
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.28
+
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.29
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.29
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.29
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.29
+
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.30
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.30
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.30
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.30
+
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.31
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.31
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.31
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.31
+
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus etcd etcd
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus coredns coredns1.11.3
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus pause kubernetes-pause
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus flannel flannel
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus flannel-cni-plugin cni-plugin-flannel
+
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-startupapicheck cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-acmesolver cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-cainjector cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-controller cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-webhook cert-manager

scripts/notify.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -xeuo pipefail
+
+command="$1"
+
+function at_err() {
+	mpv -really-quiet /usr/share/sounds/freedesktop/stereo/dialog-error.oga &
+	notify-send -a "$command" "Failed to execute '$command'!"
+}
+
+trap at_err ERR
+
+$command
+
+mpv -really-quiet /usr/share/sounds/freedesktop/stereo/complete.oga &
+notify-send -a "$command" "Done executing '$command'!"