Исправлено определение тега для redos в docker-get-base-tag

Добавлен alt10 во все пресеты с ALT Linux
Добавлены alt9 и alt10 вместо alt-linux во все файлы
2025-10-27 09:59:07 +03:00 · 2025-10-27 09:58:16 +03:00 · 2025-10-27 09:57:01 +03:00 · 2025-10-27 09:53:14 +03:00
23 changed files with 111 additions and 37 deletions
--- a/20
+++ b/20
@@ -31,7 +31,7 @@ CONTAINER_NAME ?= ansible-controller
 # Переменные для Docker Hub
 DOCKER_REGISTRY ?= inecs/ansible-lab
 DOCKER_VERSION ?= latest
-DOCKER_IMAGES := ansible-controller alt-linux astra-linux redos rhel centos7 centos8 centos9 alma rocky ubuntu20 ubuntu22 ubuntu24 debian9 debian10 debian11 debian12
+DOCKER_IMAGES := ansible-controller alt9 alt10 astra-linux redos rhel centos7 centos8 centos9 alma rocky ubuntu20 ubuntu22 ubuntu24 debian9 debian10 debian11 debian12

 # Multi-arch поддержка
 DOCKER_PLATFORMS ?= linux/amd64,linux/arm64
@@ -598,7 +598,7 @@ docker:
 			echo "     💡 Рекомендует: docker login перед работой"; \
 			echo ""; \
 			echo "  🐳 make docker build     - собрать все Docker образы (multi-arch)"; \
-			echo "     💡 Собирает: ansible-controller, alt-linux, astra-linux, redos"; \
+			echo "     💡 Собирает: ansible-controller, alt9, alt10, astra-linux, redos"; \
 			echo "     💡 Собирает: rhel, centos, alma, rocky, ubuntu, debian"; \
 			echo "     💡 Платформы: $(DOCKER_PLATFORMS)"; \
 			echo "     💡 Ограничения: RED OS и Astra Linux только AMD64"; \
@@ -659,7 +659,7 @@ docker:
 			echo "     💡 Рекомендует: docker login перед работой"; \
 			echo ""; \
 			echo "  🐳 make docker build     - собрать все Docker образы (multi-arch)"; \
-			echo "     💡 Собирает: ansible-controller, alt-linux, astra-linux, redos"; \
+			echo "     💡 Собирает: ansible-controller, alt9, alt10, astra-linux, redos"; \
 			echo "     💡 Собирает: rhel, centos, alma, rocky, ubuntu, debian"; \
 			echo "     💡 Платформы: $(DOCKER_PLATFORMS)"; \
 			echo "     💡 Ограничения: RED OS и Astra Linux только AMD64"; \
@@ -822,21 +822,26 @@ docker-get-base-tag:
 		exit 1; \
 	fi; \
 	case "$(IMAGE)" in \
-		alt-linux) \
+		alt9) \
 			BASE_IMAGE="alt:p9"; \
 			echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
 			docker pull $$BASE_IMAGE >/dev/null 2>&1 || echo "⚠️  Не удалось загрузить $$BASE_IMAGE" >&2; \
 			TAG=$$(docker inspect --format='{{.RepoTags}}' $$BASE_IMAGE 2>/dev/null | tr -d '[]' | cut -d',' -f1 | cut -d':' -f2 | tr -d ' ' || echo "latest");; \
+		alt10) \
+			BASE_IMAGE="alt:p10"; \
+			echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
+			docker pull $$BASE_IMAGE >/dev/null 2>&1 || echo "⚠️  Не удалось загрузить $$BASE_IMAGE" >&2; \
+			TAG=$$(docker inspect --format='{{.RepoTags}}' $$BASE_IMAGE 2>/dev/null | tr -d '[]' | cut -d',' -f1 | cut -d':' -f2 | tr -d ' ' || echo "latest");; \
 		astra-linux) \
 			BASE_IMAGE="registry.astralinux.ru/library/astra/ubi17:1.7.6.uu2"; \
 			echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
 			docker pull $$BASE_IMAGE >/dev/null 2>&1 || echo "⚠️  Не удалось загрузить $$BASE_IMAGE" >&2; \
 			TAG=$$(docker inspect --format='{{.RepoTags}}' $$BASE_IMAGE 2>/dev/null | tr -d '[]' | cut -d',' -f1 | cut -d':' -f2 | tr -d ' ' || echo "latest");; \
 		redos) \
-			BASE_IMAGE="registry.red-soft.ru/ubi7/ubi"; \
+			BASE_IMAGE="registry.red-soft.ru/ubi7/ubi:latest"; \
 			echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
 			docker pull $$BASE_IMAGE >/dev/null 2>&1 || echo "⚠️  Не удалось загрузить $$BASE_IMAGE" >&2; \
-			TAG=$$(docker inspect --format='{{.RepoTags}}' $$BASE_IMAGE 2>/dev/null | tr -d '[]' | cut -d',' -f1 | cut -d':' -f2 | tr -d ' ' || echo "latest");; \
+			TAG="latest";; \
 		rhel) \
 			BASE_IMAGE="registry.access.redhat.com/ubi8/ubi"; \
 			echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
@@ -1167,7 +1172,8 @@ custom-images:
 			echo ""; \
 			echo "💡 Собственные образы:"; \
 			echo "  - inecs/ansible-lab:ansible-controller-latest"; \
-			echo "  - inecs/ansible-lab:alt-linux-latest"; \
+			echo "  - inecs/ansible-lab:alt9-latest"; \
+			echo "  - inecs/ansible-lab:alt10-latest"; \
 			echo "  - inecs/ansible-lab:astra-linux-latest"; \
 			echo "  - inecs/ansible-lab:redos-latest"; \
 			echo "  - inecs/ansible-lab:rhel-latest"; \
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ AnsibleLab/
 │   ├── alma/                    # AlmaLinux 8
 │   ├── rocky/                   # Rocky Linux 8
 │   ├── rhel/                    # RHEL 8
-│   ├── alt-linux/               # ALT Linux P9
+│   ├── alt9/               # ALT Linux P9
 │   ├── astra-linux/             # Astra Linux 1.7
 │   └── redos/                   # RED OS 9
 ├── cicd/                        # CI/CD конфигурации
--- a/dockerfiles/README.md
+++ b/dockerfiles/README.md
@@ -16,7 +16,7 @@ dockerfiles/
 │   ├── Dockerfile
 │   ├── docker-compose.yml
 │   └── requirements.txt
-├── alt-linux/             # ALT Linux P9 с systemd
+├── alt9/             # ALT Linux P9 с systemd
 │   └── Dockerfile
 ├── astra-linux/           # Astra Linux 1.7 с systemd
 │   └── Dockerfile
@@ -378,10 +378,10 @@ docker run -d --privileged \
  inecs/ansible-lab:rocky-latest
 ```

-### 8. alt-linux
+### 8. alt9

 **Базовый образ:** `altlinux/p9`  
-**Тег:** `inecs/ansible-lab:alt-linux-latest`  
+**Тег:** `inecs/ansible-lab:alt9-latest`  
 **Описание:** ALT Linux 9 с systemd и Docker

 #### Компоненты:
@@ -408,11 +408,11 @@ systemctl set-default multi-user.target
 ```bash
 # Запуск ALT Linux контейнера
 docker run -d --privileged \
-  --name alt-linux-test \
+  --name alt9-test \
  -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
  --tmpfs /run --tmpfs /run/lock \
  --cap-add SYS_ADMIN \
-  inecs/ansible-lab:alt-linux-latest
+  inecs/ansible-lab:alt9-latest
 ```

 ### 9. astra-linux
@@ -581,7 +581,7 @@ images:
  centos: "inecs/ansible-lab:centos-latest"
  alma: "inecs/ansible-lab:alma-latest"
  rocky: "inecs/ansible-lab:rocky-latest"
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt: "inecs/ansible-lab:alt9-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  redos: "inecs/ansible-lab:redos-latest"

--- a/dockerfiles/alt10/Dockerfile
+++ b/dockerfiles/alt10/Dockerfile
@@ -0,0 +1,53 @@
+# ALT Linux 10 (Platform 10) с systemd
+# Автор: Сергей Антропов
+# Сайт: https://devops.org.ru
+# https://hub.docker.com/_/alt/tags
+# Тег: inecs/ansible-lab:alt10-latest
+
+FROM alt:p10
+
+# Обновляем систему
+RUN apt-get update && apt-get dist-upgrade -y
+
+# Устанавливаем systemd и необходимые пакеты
+RUN apt-get install -y \
+    systemd \
+    dbus \
+    curl \
+    wget \
+    nano \
+    python3 \
+    sudo \
+    && apt-get clean
+
+# Устанавливаем pip для Python 3.11
+RUN curl -sS https://bootstrap.pypa.io/pip/get-pip.py | python3
+
+# Устанавливаем yq
+# RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
+#     && chmod +x /usr/local/bin/yq
+
+# Устанавливаем Docker вручную для ALT Linux
+# RUN apt-get update && apt-get install -y \
+#     ca-certificates \
+#     curl \
+#     gnupg \
+#     && apt-get clean
+
+# Устанавливаем Docker Compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
+
+# Настраиваем systemd
+RUN systemctl set-default multi-user.target
+
+# Настраиваем sudoers для root и пользователей
+RUN echo "root ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
+    echo "ALL ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/ansible-test
+
+# Создаем пользователя для Ansible
+RUN useradd -m -s /bin/bash ansible \
+    && echo "ansible ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+# Команда по умолчанию (система запускается от root для systemd)
+CMD ["/sbin/init"]
--- a/dockerfiles/alt-linux/Dockerfile
+++ b/dockerfiles/alt-linux/Dockerfile
@@ -1,7 +1,8 @@
-# ALT Linux с systemd
+# ALT Linux 9 (Platform 9) с systemd
 # Автор: Сергей Антропов
 # Сайт: https://devops.org.ru
 # https://hub.docker.com/_/alt/tags
+# Тег: inecs/ansible-lab:alt9-latest

 FROM alt:p9

--- a/docs/dockerfiles.md
+++ b/docs/dockerfiles.md
@@ -13,7 +13,7 @@ AnsibleLab использует предварительно собранные
 ```
 dockerfiles/
 ├── ansible-controller/     # Ansible контроллер
-├── alt-linux/             # ALT Linux P9
+├── alt9/             # ALT Linux P9
 ├── astra-linux/           # Astra Linux 1.7
 ├── redos/                 # RED OS 9
 ├── rhel/                  # Red Hat Enterprise Linux 8
@@ -194,7 +194,7 @@ Red Hat Enterprise Linux 8 с systemd.
 ### ALT Linux

 **Базовый образ:** `altlinux/p9`  
-**Тег:** `inecs/ansible-lab:alt-linux-latest`  
+**Тег:** `inecs/ansible-lab:alt9-latest`  
 **Платформы:** linux/amd64 (ограничение базового образа)

 ALT Linux P9 с systemd.
@@ -357,7 +357,7 @@ docker run -d --privileged \
 | alma | amd64, arm64 | ✅ | ✅ | ✅ |
 | rocky | amd64, arm64 | ✅ | ✅ | ✅ |
 | rhel | amd64, arm64 | ✅ | ✅ | ✅ |
-| alt-linux | amd64 | ✅ | ✅ | ✅ |
+| alt9 | amd64 | ✅ | ✅ | ✅ |
 | astra-linux | amd64 | ✅ | ✅ | ✅ |
 | redos | amd64 | ✅ | ✅ | ✅ |

--- a/docs/molecule-guide.md
+++ b/docs/molecule-guide.md
@@ -131,7 +131,7 @@ vars:
  docker_network: labnet
  generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
  images:
-    alt: "inecs/ansible-lab:alt-linux-latest"
+    alt: "inecs/ansible-lab:alt9-latest"
    astra: "inecs/ansible-lab:astra-linux-latest"
    rhel: "inecs/ansible-lab:rhel-latest"
    centos: "inecs/ansible-lab:centos-latest"
--- a/molecule/default/create.yml
+++ b/molecule/default/create.yml
@@ -10,7 +10,8 @@
    docker_network: labnet
    generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
    images:
-      alt: "inecs/ansible-lab:alt-linux-latest"
+      alt9: "inecs/ansible-lab:alt9-latest"
+      alt10: "inecs/ansible-lab:alt10-latest"
      astra: "inecs/ansible-lab:astra-linux-latest"
      rhel: "inecs/ansible-lab:rhel-latest"
      centos: "inecs/ansible-lab:centos-latest"
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ platforms:
    image: inecs/ansible-lab:ansible-controller-latest
    pre_build_image: true
  - name: alt-linux
-    image: inecs/ansible-lab:alt-linux-latest
+    image: inecs/ansible-lab:alt9-latest
    pre_build_image: true
  - name: astra-linux
    image: inecs/ansible-lab:astra-linux-latest
--- a/molecule/presets/default.yml
+++ b/molecule/presets/default.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/all-images.yml
+++ b/molecule/presets/examples/all-images.yml
@@ -9,7 +9,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/docker-full.yml
+++ b/molecule/presets/examples/docker-full.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/docker-test.yml
+++ b/molecule/presets/examples/docker-test.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/etcd-patroni.yml
+++ b/molecule/presets/examples/etcd-patroni.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/minimal.yml
+++ b/molecule/presets/examples/minimal.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/multi-os.yml
+++ b/molecule/presets/examples/multi-os.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы для разных ОС
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/performance.yml
+++ b/molecule/presets/examples/performance.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/security.yml
+++ b/molecule/presets/examples/security.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/stable.yml
+++ b/molecule/presets/examples/stable.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/standart.yml
+++ b/molecule/presets/examples/standart.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/examples/test.yml
+++ b/molecule/presets/examples/test.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/molecule/presets/mytest.yml
+++ b/molecule/presets/mytest.yml
@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"

 # systemd-ready образы
 images:
-  alt: "inecs/ansible-lab:alt-linux-latest"
+  alt9: "inecs/ansible-lab:alt9-latest"
+  alt10: "inecs/ansible-lab:alt10-latest"
  astra: "inecs/ansible-lab:astra-linux-latest"
  rhel: "inecs/ansible-lab:rhel-latest"
  centos7: "inecs/ansible-lab:centos7-latest"
--- a/scripts/test-custom-images.sh
+++ b/scripts/test-custom-images.sh
@@ -45,7 +45,7 @@ check_images() {
    
    local images=(
        "inecs/ansible-lab:ansible-controller-latest"
-        "inecs/ansible-lab:alt-linux-latest"
+        "inecs/ansible-lab:alt9-latest"
        "inecs/ansible-lab:astra-linux-latest"
        "inecs/ansible-lab:redos-latest"
        "inecs/ansible-lab:rhel-latest"
@@ -82,8 +82,8 @@ check_images() {
                "inecs/ansible-lab:ansible-controller-latest")
                    echo "  make docker build-image IMAGE=ansible-controller"
                    ;;
-                "inecs/ansible-lab:alt-linux-latest")
-                    echo "  make docker build-image IMAGE=alt-linux"
+                "inecs/ansible-lab:alt9-latest")
+                    echo "  make docker build-image IMAGE=alt9"
                    ;;
                "inecs/ansible-lab:astra-linux-latest")
                    echo "  make docker build-image IMAGE=astra-linux"
Author	SHA1	Message	Date
Сергей Антропов	5169310c35	Исправлено определение тега для redos в docker-get-base-tag Some checks failed Ansible Testing / lint (push) Has been cancelled Details Ansible Testing / test (default) (push) Has been cancelled Details Ansible Testing / test (minimal) (push) Has been cancelled Details Ansible Testing / test (performance) (push) Has been cancelled Details Ansible Testing / deploy-check (push) Has been cancelled Details	2025-10-27 09:59:07 +03:00
Сергей Антропов	50bfff11c7	Добавлен alt10 во все пресеты с ALT Linux	2025-10-27 09:58:16 +03:00
Сергей Антропов	f5b13436a7	Добавлены alt9 и alt10 вместо alt-linux во все файлы	2025-10-27 09:57:01 +03:00
Сергей Антропов	13a294a20c	Переименование alt-linux в alt9 и добавление alt10	2025-10-27 09:53:14 +03:00