From f5b13436a776d7ecfade34ef2fa3a601418ce2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BF=D0=BE=D0=B2?= Date: Mon, 27 Oct 2025 09:57:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20alt9=20=D0=B8=20alt10=20=D0=B2=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=BE=20alt-linux=20=D0=B2=D0=BE=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 16 +++++++++++----- README.md | 2 +- dockerfiles/README.md | 12 ++++++------ docs/dockerfiles.md | 6 +++--- docs/molecule-guide.md | 2 +- molecule/default/create.yml | 3 ++- molecule/default/molecule.yml | 2 +- molecule/presets/default.yml | 2 +- molecule/presets/examples/all-images.yml | 2 +- molecule/presets/examples/docker-full.yml | 2 +- molecule/presets/examples/docker-test.yml | 2 +- molecule/presets/examples/etcd-patroni.yml | 2 +- molecule/presets/examples/minimal.yml | 2 +- molecule/presets/examples/multi-os.yml | 2 +- molecule/presets/examples/performance.yml | 2 +- molecule/presets/examples/security.yml | 2 +- molecule/presets/examples/stable.yml | 3 ++- molecule/presets/examples/standart.yml | 2 +- molecule/presets/examples/test.yml | 2 +- molecule/presets/mytest.yml | 2 +- scripts/test-custom-images.sh | 6 +++--- 21 files changed, 42 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 182ef84..ae77e96 100644 --- a/Makefile +++ b/Makefile @@ -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,11 +822,16 @@ 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; \ @@ -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"; \ diff --git a/README.md b/README.md index fbbc4d4..b4d81d4 100644 --- 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 конфигурации diff --git a/dockerfiles/README.md b/dockerfiles/README.md index ce0f097..d62ac75 100644 --- 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" diff --git a/docs/dockerfiles.md b/docs/dockerfiles.md index 59544b0..ba2cddc 100644 --- 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 | ✅ | ✅ | ✅ | diff --git a/docs/molecule-guide.md b/docs/molecule-guide.md index 299c3c6..58568c1 100644 --- 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" diff --git a/molecule/default/create.yml b/molecule/default/create.yml index c405b91..f919310 100644 --- 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" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 10213ac..b3e9ccc 100644 --- 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 diff --git a/molecule/presets/default.yml b/molecule/presets/default.yml index 66bb22b..a8d871e 100644 --- a/molecule/presets/default.yml +++ b/molecule/presets/default.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/all-images.yml b/molecule/presets/examples/all-images.yml index 7d2ec14..c5af302 100644 --- a/molecule/presets/examples/all-images.yml +++ b/molecule/presets/examples/all-images.yml @@ -9,7 +9,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/docker-full.yml b/molecule/presets/examples/docker-full.yml index 22adf6d..ff536e4 100644 --- a/molecule/presets/examples/docker-full.yml +++ b/molecule/presets/examples/docker-full.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/docker-test.yml b/molecule/presets/examples/docker-test.yml index af5925a..b9c1258 100644 --- a/molecule/presets/examples/docker-test.yml +++ b/molecule/presets/examples/docker-test.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/etcd-patroni.yml b/molecule/presets/examples/etcd-patroni.yml index 69ae07f..01a4b41 100644 --- a/molecule/presets/examples/etcd-patroni.yml +++ b/molecule/presets/examples/etcd-patroni.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/minimal.yml b/molecule/presets/examples/minimal.yml index 9d9cf4c..2b130e5 100644 --- a/molecule/presets/examples/minimal.yml +++ b/molecule/presets/examples/minimal.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/multi-os.yml b/molecule/presets/examples/multi-os.yml index f0073cc..d2582b3 100644 --- a/molecule/presets/examples/multi-os.yml +++ b/molecule/presets/examples/multi-os.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы для разных ОС 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/performance.yml b/molecule/presets/examples/performance.yml index 477a431..780ca74 100644 --- a/molecule/presets/examples/performance.yml +++ b/molecule/presets/examples/performance.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/security.yml b/molecule/presets/examples/security.yml index 82f3006..641499c 100644 --- a/molecule/presets/examples/security.yml +++ b/molecule/presets/examples/security.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/stable.yml b/molecule/presets/examples/stable.yml index 50ec4eb..a45b476 100644 --- 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" diff --git a/molecule/presets/examples/standart.yml b/molecule/presets/examples/standart.yml index 6044d61..d54ad66 100644 --- a/molecule/presets/examples/standart.yml +++ b/molecule/presets/examples/standart.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/examples/test.yml b/molecule/presets/examples/test.yml index f6e8ee7..a010a23 100644 --- a/molecule/presets/examples/test.yml +++ b/molecule/presets/examples/test.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/molecule/presets/mytest.yml b/molecule/presets/mytest.yml index 7fabbe5..b1e0fca 100644 --- a/molecule/presets/mytest.yml +++ b/molecule/presets/mytest.yml @@ -8,7 +8,7 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" # systemd-ready образы 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" centos7: "inecs/ansible-lab:centos7-latest" diff --git a/scripts/test-custom-images.sh b/scripts/test-custom-images.sh index 03b6360..a2c1f5b 100755 --- 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"