Add support for versioned building from tasks

2025-03-19 22:43:19 +03:00
22 changed files with 78 additions and 214 deletions
--- a/.gitea/workflows/wf_full.yaml
+++ b/.gitea/workflows/wf_full.yaml
@ -3,7 +3,6 @@ on:
  push:
    tags:
      - '*_*'
-      - '!*_k8s'

 jobs:
  build-process:
@ -15,14 +14,6 @@ jobs:
      repo: ${{ env.REPO }}
      buildres: ${{ steps.build-script.outcome }}
    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 python3-module-yaml python3-module-requests podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
      - name: Check workspace
        run: |
          repourl=$(echo $GU | cut -d '/' -f 3)
@ -34,6 +25,23 @@ jobs:
        env:
          GU: ${{ gitea.server_url }}
          GR: ${{ gitea.repository }}
+      - name: Set repo for c10f2 (Temporary)
+        if: ${{ contains(github.ref_name, 'c10f2') }}
+        run: |
+          echo "event tag=${{ github.ref_name }}" 
+          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
+          echo "cat /etc/hosts"
+          cat /etc/hosts
+      - name: Update apt
+        uses: actions/init-alt-env@v1
+      - name: Install requires
+        run: |
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
+      - name: Check out current repo
+        uses: actions/checkout@v4
      - name: Parse target branch and tag from events context, save to env
        env:
          EV: ${{ toJson(gitea.event) }}
@ -43,24 +51,6 @@ jobs:
          org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
          echo "ORG=$org" >> ${GITHUB_ENV}
          echo "ORG=$org"
-      - name: Check out current repo
-        uses: actions/checkout@v4
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-        env:
-          ORG: ${{ env.ORG }}
-      - 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: Login podman gitea
        run: |
          echo "podman login ${{ env.URL }}"
@ -71,16 +61,14 @@ jobs:
      - name: Run building script
        id: build-script
        run: |
-          #build base with riskv64 for sisyphus if it is
-          if [[ "$BR" == "sisyphus" && "$ORG" == "base" ]]; then echo "${{ gitea.workspace }}/build.py --log-level debug -i base/base -b $BR --latest $BR --registry $BUILD_URL"; ${{ gitea.workspace }}/build.py -i base/base -b "$BR" --latest "$BR" --registry "$BUILD_URL"; fi
-          build_args="-b $BR --log-level debug --latest $BR -o $ORG --registry $BUILD_URL --package-versions {\"alt/etcd\":\"3.5.15\"}"
-          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64 --skip-images base/base"; else arches="--arches amd64 386 arm64"; fi 
-          echo "${{ gitea.workspace }}/build.py $build_args $arches"
+          build_args="-b $BR --latest $BR -o $ORG --registry gitea.basealt.ru/alt"
+          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
+          if [[ "$ORG" == "k8s" ]]; then build_args="$build_args --overwrite-organization $ORG-$BR --package-versions {\"k8s/kube-apiserver\":\"1.31\",\"k8s/kube-scheduler\":\"1.31\",\"k8s/kube-controller-manager\":\"1.31\",\"k8s/kube-proxy\":\"1.31\",\"k8s/coredns\":\"1.11.3\",\"k8s/kubelet\":\"1.31\"}"; fi
+          echo "build.py $build_args $arches"
          ${{ gitea.workspace }}/build.py $build_args $arches
        env:
          ORG: ${{ env.ORG }}
          BR: ${{ env.BRANCH }}
-          BUILD_URL: "gitea.basealt.ru/alt"
        continue-on-error: true
      - name: Send notification if build crashed
        if: ${{ steps.build-script.outcome != 'success' }}
--- a/.gitea/workflows/wf_single.yaml
+++ b/.gitea/workflows/wf_single.yaml
@ -43,15 +43,6 @@ jobs:
          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
      - name: Check out current repo
        uses: actions/checkout@v4
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-        env:                                                                                                               
-          ORG: ${{ env.ORG }}
      - name: Login podman gitea
        run: |
          echo "podman login ${{ env.URL }}"
@ -87,10 +78,10 @@ jobs:
      - name: Run building script
        id: build-script
        run: |
-          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
+          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--overwrite-organization $ORG-$BR --package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
          echo "build.py -i $IM -b $BR $arches $k8sarg"
-          ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches --latest $BR --log-level debug --registry gitea.basealt.ru/alt $k8sarg 
+          ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches $k8sarg 
        env:
          IM: ${{ env.IMAGE }}
          VER: ${{ env.VER }}
@ -137,8 +128,7 @@ jobs:
        if: ${{ needs.build-process.outputs.test != '' }}
        continue-on-error: true
        run: |
-          imname=$(echo "$IM" | cut -d "/" -f2)
-          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$REPO/$BR/$imname:latest -c "$TEST"; fi
+          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
        env:
          IM: ${{ needs.build-process.outputs.image }} 
          BR: ${{ needs.build-process.outputs.branch }}
@ -150,9 +140,8 @@ jobs:
        if: ${{ needs.build-process.outputs.test == '' }}
        continue-on-error: true
        run: |
-          imname=$(echo "$IM" | cut -d "/" -f2)
-          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest true; fi
-          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest --version; fi
+          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$IM:$BR true; fi
+          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$IM:$BR --version; fi
        env:
          IM: ${{ needs.build-process.outputs.image }}
          BR: ${{ needs.build-process.outputs.branch }}
--- a/README.md
+++ b/README.md
@ -38,12 +38,10 @@ If you push to the users repository, then organiztion is your username.
  If contains jinja2 template syntax, `--package-version`
  CLI option must be specified.

- `version_template`: **string** or **list of strings** (OPTIONAL)
+- `version_template`: **string** (OPTIONAL)

-  Template to apply when construction the tag,
-  `version` string variable is available in the template.
-  If `version_template` is a list of strings, then the image wiil be tagged
-  with every string in the list.
+  template to apply when construction the tag,
+  `version` string variable is available in the template

 ### examples

@ -86,22 +84,6 @@ source_packages:
 ./build.py -i k8s/pause
 ```

-#### org/k8s/etcd
-
-```yaml
-is_versioned: true
-version_template:
-  - "v{{ version }}"
-  - "{{ version }}"
-  - "{{ version }}-0"
-source_packages:
-  - etcd-for-kubernetes{{ version }}
-```
-
-```bash
-./build.py -b sisyphus -i k8s/etcd --package-version '{"k8s/etcd": "1.32"}'
-```
-
 ## Dependencies
 On x86_64 machine using p10 branch you need:
 - `python3-module-tomli`
--- a/build.py
+++ b/build.py
@ -11,32 +11,25 @@ from datetime import datetime
 from dataclasses import dataclass
 from graphlib import TopologicalSorter
 from pathlib import Path
-from typing import Optional, Union

 import requests
 import tomli
 import yaml
-from jinja2 import Environment, BaseLoader
+from jinja2 import Template

 logger = logging.getLogger(__name__)

 ORG_DIR = Path("org")

-PKG_VERSIONS: Optional[dict] = None
+PKG_VERSIONS: dict | None = None

-# Jinja2 custom fail filter
-def fail(message: str):
-    raise ValueError(message)
-
-JINJA_ENV = Environment(loader=BaseLoader())
-JINJA_ENV.filters['fail'] = fail

@dataclass
 class Image:
    canonical_name: str
-    is_versioned: Optional[bool]
-    version_template: Union[list[str], str, None]
-    source_packages: Optional[list[str]]
+    is_versioned: bool | None
+    version_template: str | None
+    source_packages: list[str] | None

    def __init__(self, canonical_name: str):
        self.canonical_name = canonical_name
@ -101,10 +94,12 @@ def api_get_source_package_version(branch: str, package_name: str) -> str:
    params = {"branch": branch, "name": package_name}
    response = requests.get(api_url, params)
    if response.status_code != 200:
+        print(response)
        api_url = "https://rdb.altlinux.org/api/site/package_versions"
        params = {"arch": "x86_64", "package_type": "source", "name": package_name}
        response = requests.get(api_url, params)
        if response.status_code != 200:
+            print(response)
            raise RuntimeError(
                    f"failed to retrieve source package version: source package {package_name!r}, branch {branch!r} "
            )
@ -126,8 +121,9 @@ def api_get_source_package_version_from_task(task_id: str, package_name: str):
    api_url = f"https://rdb.altlinux.org/api/task/packages/{task_id}"
    response = requests.get(api_url)
    if response.status_code != 200:
+        print(response)
        raise RuntimeError(
-            f"failed to retrieve source package version from task: source package {package_name!r}, task_id {task_id}"
+            f"failed to retrieve source package version from task: source package {package_name!r}, branch {branch!r}, task_id {task_id}"
        )

    result = response.json()
@ -136,19 +132,19 @@ def api_get_source_package_version_from_task(task_id: str, package_name: str):
            return subtask["source"]["version"]

    raise RuntimeError(
-        f"failed to retrieve source package version from task: source package {package_name!r}, task_id {task_id}"
+        f"failed to retrieve source package version from task: source package {package_name!r}, branch {branch!r}, task_id {task_id}"
    )


 class Tags:
-    def __init__(self, tags_file: Optional[str], latest: str):
+    def __init__(self, tags_file: str | None, latest: str):
        if tags_file is None:
            self._tags = None
        else:
            self._tags = tomli.loads(Path(tags_file).read_text())
        self._latest = latest

-    def tags(self, branch: str, image: Image, tasks: Optional[Tasks] = None):
+    def tags(self, branch: str, image: Image, tasks: Tasks | None = None):
        if self._tags is None:
            if image.is_versioned is None:
                tags = [branch]
@ -159,7 +155,8 @@ class Tags:
                package_name = image.source_packages[0]

                if re.search("{%.*%}", package_name):
-                    package_name = JINJA_ENV.from_string(package_name).render(branch=branch).strip()
+                    package_name = Template(package_name).render(branch=branch).strip()
+                    print(f"{package_name=}")

                if re.search("{{.*}}", package_name):
                    if PKG_VERSIONS is None:
@ -177,7 +174,7 @@ class Tags:
                            f"invalid version for image {image.canonical_name!r}: {PKG_VERSIONS[image.canonical_name]!r}"
                        )

-                    package_name = JINJA_ENV.from_string(package_name).render(
+                    package_name = Template(package_name).render(
                        version=PKG_VERSIONS[image.canonical_name]
                    )

@ -203,32 +200,18 @@ class Tags:
                    )
                    version = api_get_source_package_version(branch, package_name)

-                tags = []
                if image.version_template is not None:
-                    if isinstance(image.version_template, str):
-                        version_tag = (
-                            JINJA_ENV.from_string(image.version_template).render(version=version).strip()
-                        )
-                        tags.append(version_tag)
-                    elif isinstance(image.version_template, list):
-                        for v in image.version_template:
-                            version_tag = (
-                                JINJA_ENV.from_string(v).render(version=version).strip()
-                            )
-                            tags.append(version_tag)
-                    else:
-                        raise RuntimeError(f"expected type for version_template: 'str' or 'list[str]', got '{type(image.version_template)}' for image {image}")
-                else:
-                    tags.append(version)
+                    version = (
+                        Template(image.version_template).render(version=version).strip()
+                    )

+                tags = [version]
                tags.append("latest")
            else:
                version = datetime.now().strftime('%Y%m%d')
                if image.version_template is not None:
-                    if not isinstance(image.version_template, str):
-                        raise RuntimeError(f"expected type for version_template: 'str', got '{type(image.version_template)}' for image {image}")
                    version = (
-                        JINJA_ENV.from_string(image.version_template).render(version=version).strip()
+                        Template(image.version_template).render(version=version).strip()
                    )
                tags = [version]
                tags.append("latest")
@ -409,13 +392,9 @@ class DockerBuilder:
        else:
            registry = ""
            alt_image = "alt"
-
-        base_image_prefix = "c10f" if self.branch == "c10f2" else self.branch
-
-        rendered = JINJA_ENV.from_string(template).render(
+        rendered = Template(template).render(
            alt_image=alt_image,
            branch=self.branch,
-            base_image_prefix=base_image_prefix,
            install_packages=install_packages,
            organization=organization,
            registry=registry,
@ -519,8 +498,6 @@ class DockerBuilder:
            pre_cmd = ["echo"]
        else:
            pre_cmd = []
-
-        logger.debug("run: %s", pre_cmd + cmd)
        subprocess.run(pre_cmd + cmd, *args, **kwargs)

    def distroless_build(self, image: Image, arches):
--- a/images-info.toml
+++ b/images-info.toml
@ -9,6 +9,3 @@ skip-arches = [ "386" ]

 ["alt/ansible"]
 skip-branches = [ "c10f2", "c10f1", "p10" ]
-
-["alt/buildkit"]
-skip-branches = [ "c10f1", "p10" ]
--- a/org/alt/buildkit/Dockerfile.template
+++ b/org/alt/buildkit/Dockerfile.template
@ -1,16 +0,0 @@
-FROM {{ registry }}{{ branch }}/base:latest
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="buildkit"
-LABEL org.opencontainers.image.description="Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"
-LABEL org.opencontainers.image.source="https://github.com/moby/buildkit"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages(
-    "ca-certificates",
-    "buildkit"
-) }}
-
-ENTRYPOINT ["/usr/bin/buildkitd"]
--- a/org/alt/buildkit/info.yaml
+++ b/org/alt/buildkit/info.yaml
@ -1,6 +0,0 @@
---
-is_versioned: true
-version_template: "{{ version }}"
-source_packages:
-  - buildkit
-...
--- a/org/alt/buildkit/test
+++ b/org/alt/buildkit/test
@ -1 +0,0 @@
-buildkitd --version
--- a/org/alt/etcd/Dockerfile.template
+++ b/org/alt/etcd/Dockerfile.template
@ -8,13 +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"

-{% if branch in ["sisyphus"] %}
-ARG PKG_VERSION
-
-{{ install_packages("etcd${PKG_VERSION}") }}
-{% else %}
 {{ install_packages("etcd") }}
-{% endif %}

 RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd

--- a/org/alt/etcd/info.yaml
+++ b/org/alt/etcd/info.yaml
@ -1,14 +1,6 @@
 ---
 is_versioned: true
-version_template:
-  - "v{{ version }}"
-  - "{{ version }}"
-  - "{{ version }}-0"
+version_template: "{{ version }}"
 source_packages:
-  - >
-    {% if branch in ["sisyphus"] %}
-    {% raw %}etcd{{ version }}{% endraw %}
-    {% else %}
-    etcd
-    {% endif %}
+  - etcd
 ...
--- a/org/alt/etcd/test
+++ b/org/alt/etcd/test
@ -1 +1 @@
-etcd --version
+etcdctl version
--- a/org/alt/nginx/Dockerfile.template
+++ b/org/alt/nginx/Dockerfile.template
@ -15,7 +15,7 @@ RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .
 RUN ln -sf /dev/stdout /var/log/nginx/access.log
 RUN ln -sf /dev/stderr /var/log/nginx/error.log

-RUN sed -Ei 's/^([[:space:]]*listen[[:space:]]+)(localhost|127.0.0.1)(:80)/\10.0.0.0\3/' \
+RUN sed -Ei 's/^([[:space:]]*listen[[:space:]]+)localhost(:80)/\10.0.0.0\2/' \
            /etc/nginx/sites-available.d/default.conf

 EXPOSE 80
--- a/org/k8s/etcd/Dockerfile.template
+++ b/org/k8s/etcd/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

@ -6,15 +6,11 @@ LABEL org.opencontainers.image.title="etcd"
 LABEL org.opencontainers.image.description="Distributed reliable key-value store for the most critical data of a distributed system"
 LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="BaseALT LLC"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"

-ARG PKG_VERSION
+{{ install_packages("etcd") }}

-{{ install_packages("etcd-for-kubernetes${PKG_VERSION}") }}
-
-RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd && ln -s /usr/bin/etcdctl /usr/local/bin/etcdctl
-
-EXPOSE 2379 2380
+RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd

 VOLUME /data

--- a/org/k8s/etcd/README.md
+++ b/org/k8s/etcd/README.md
@ -1,19 +0,0 @@
-dockerfiles-alt-etcd
-=========================
-
-ALT dockerfile for etcd.
-
-Copy Dockerfile somewhere and build the image:
-```console
-$ podman build --rm -t <username>/etcd.
-```
-
-And launch the etcd container:
-```console
-$ podman run -d -v <etcd data dir>:/data <username>/etcd
-```
-
-If etcdclt is wanted, it could be run via:
-```console
-$ podman run --entrypoint etcdctl <username>/etcd
-```
--- a/org/k8s/etcd/info.yaml
+++ b/org/k8s/etcd/info.yaml
@ -1,9 +1,12 @@
 ---
 is_versioned: true
-version_template:
-  - "v{{ version }}"
-  - "{{ version }}"
-  - "{{ version }}-0"
+version_template: >
+  {% set version_patch = version.split(".")[2] | int %}
+  {% if version_patch < 16 %}
+    {{ version }}-0
+  {% else %}
+    v{{ version }}
+  {% endif %}
 source_packages:
-  - etcd-for-kubernetes{{ version }}
+  - etcd
 ...
--- a/org/k8s/etcd/test
+++ b/org/k8s/etcd/test
@ -1 +1 @@
-etcd --version && etcdctl --version
+etcd --version
--- a/org/k8s/flannel-cni-plugin/info.yaml
+++ b/org/k8s/flannel-cni-plugin/info.yaml
@ -1,18 +1,6 @@
 ---
 is_versioned: true
-version_template: >-
-  {%- set version_parts = version.split('.') -%}
-  {%- if version_parts | length == 3 -%}
-    {%- if version == "1.4.0" -%}
-    v{{ version }}-flannel1
-    {%- else -%}
-    v{{ version }}
-    {%- endif %}
-  {%- elif version_parts | length == 4 -%}
-    v{{ version.rsplit('.', 1) | first }}-flannel{{ version.rsplit('.', 1) | last }}
-  {%- else -%}
-    {{ "Invalid version format: must have 3 or 4 parts" | fail }}
-  {%- endif %}
+version_template: v{{ version.rsplit('.', 1) | first  }}-flannel{{ version.rsplit('.', 1) | last }}
 source_packages:
  - cni-plugin-flannel
 ...
--- a/org/k8s/kube-apiserver/Dockerfile.template
+++ b/org/k8s/kube-apiserver/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

@ -14,4 +14,4 @@ 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="BaseALT LLC"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
--- a/org/k8s/kube-controller-manager/Dockerfile.template
+++ b/org/k8s/kube-controller-manager/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

@ -14,4 +14,4 @@ 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="BaseALT LLC"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
--- a/org/k8s/kube-proxy/Dockerfile.template
+++ b/org/k8s/kube-proxy/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

@ -14,4 +14,4 @@ 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="BaseALT LLC"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
--- a/org/k8s/kube-scheduler/Dockerfile.template
+++ b/org/k8s/kube-scheduler/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

@ -14,4 +14,4 @@ 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="BaseALT LLC"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
--- a/org/k8s/kubelet/Dockerfile.template
+++ b/org/k8s/kubelet/Dockerfile.template
@ -1,4 +1,4 @@
-FROM {{ registry }}{{ base_image_prefix }}/{{ alt_image }}:latest
+FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest

 MAINTAINER alt-cloud

@ -14,4 +14,4 @@ LABEL org.opencontainers.image.title="kubelet" \
    org.opencontainers.image.description="An agent that runs on each node in the cluster. It makes sure that containers are running in a Pod." \
    org.opencontainers.image.source="https://github.com/kubernetes/kubernetes" \
    org.opencontainers.image.licenses="Apache-2.0" \
-    org.opencontainers.image.vendor="BaseALT LLC"
+    org.opencontainers.image.vendor="ALT Linux Team" \