Ansible/DevOpsLab
Template
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Добавлены alt9 и alt10 вместо alt-linux во все файлы

Browse Source
This commit is contained in:
Сергей Антропов
2025-10-27 09:57:01 +03:00
parent 13a294a20c
commit f5b13436a7
21 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -31,7 +31,7 @@ CONTAINER_NAME ?= ansible-controller
# Переменные для Docker Hub # Переменные для Docker Hub
DOCKER_REGISTRY ?= inecs/ansible-lab DOCKER_REGISTRY ?= inecs/ansible-lab
DOCKER_VERSION ?= latest 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 поддержка # Multi-arch поддержка
DOCKER_PLATFORMS ?= linux/amd64,linux/arm64 DOCKER_PLATFORMS ?= linux/amd64,linux/arm64
@@ -598,7 +598,7 @@ docker:
echo " 💡 Рекомендует: docker login перед работой"; \ echo " 💡 Рекомендует: docker login перед работой"; \
echo ""; \ echo ""; \
echo " 🐳 make docker build - собрать все Docker образы (multi-arch)"; \ 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 " 💡 Собирает: rhel, centos, alma, rocky, ubuntu, debian"; \
echo " 💡 Платформы: $(DOCKER_PLATFORMS)"; \ echo " 💡 Платформы: $(DOCKER_PLATFORMS)"; \
echo " 💡 Ограничения: RED OS и Astra Linux только AMD64"; \ echo " 💡 Ограничения: RED OS и Astra Linux только AMD64"; \
@@ -659,7 +659,7 @@ docker:
echo " 💡 Рекомендует: docker login перед работой"; \ echo " 💡 Рекомендует: docker login перед работой"; \
echo ""; \ echo ""; \
echo " 🐳 make docker build - собрать все Docker образы (multi-arch)"; \ 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 " 💡 Собирает: rhel, centos, alma, rocky, ubuntu, debian"; \
echo " 💡 Платформы: $(DOCKER_PLATFORMS)"; \ echo " 💡 Платформы: $(DOCKER_PLATFORMS)"; \
echo " 💡 Ограничения: RED OS и Astra Linux только AMD64"; \ echo " 💡 Ограничения: RED OS и Astra Linux только AMD64"; \
@@ -822,11 +822,16 @@ docker-get-base-tag:
exit 1; \ exit 1; \
fi; \ fi; \
case "$(IMAGE)" in \ case "$(IMAGE)" in \
alt-linux) \ alt9) \
BASE_IMAGE="alt:p9"; \ BASE_IMAGE="alt:p9"; \
echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \ echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
docker pull $$BASE_IMAGE >/dev/null 2>&1 || 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=$$(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) \ astra-linux) \
BASE_IMAGE="registry.astralinux.ru/library/astra/ubi17:1.7.6.uu2"; \ BASE_IMAGE="registry.astralinux.ru/library/astra/ubi17:1.7.6.uu2"; \
echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \ echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
@@ -1167,7 +1172,8 @@ custom-images:
echo ""; \ echo ""; \
echo "💡 Собственные образы:"; \ echo "💡 Собственные образы:"; \
echo " - inecs/ansible-lab:ansible-controller-latest"; \ 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:astra-linux-latest"; \
echo " - inecs/ansible-lab:redos-latest"; \ echo " - inecs/ansible-lab:redos-latest"; \
echo " - inecs/ansible-lab:rhel-latest"; \ echo " - inecs/ansible-lab:rhel-latest"; \

2
README.md
View File

@@ -60,7 +60,7 @@ AnsibleLab/
│ ├── alma/ # AlmaLinux 8 │ ├── alma/ # AlmaLinux 8
│ ├── rocky/ # Rocky Linux 8 │ ├── rocky/ # Rocky Linux 8
│ ├── rhel/ # RHEL 8 │ ├── rhel/ # RHEL 8
│ ├── alt-linux/ # ALT Linux P9 │ ├── alt9/ # ALT Linux P9
│ ├── astra-linux/ # Astra Linux 1.7 │ ├── astra-linux/ # Astra Linux 1.7
│ └── redos/ # RED OS 9 │ └── redos/ # RED OS 9
├── cicd/ # CI/CD конфигурации ├── cicd/ # CI/CD конфигурации

12
dockerfiles/README.md
View File

@@ -16,7 +16,7 @@ dockerfiles/
│ ├── Dockerfile │ ├── Dockerfile
│ ├── docker-compose.yml │ ├── docker-compose.yml
│ └── requirements.txt │ └── requirements.txt
├── alt-linux/ # ALT Linux P9 с systemd ├── alt9/ # ALT Linux P9 с systemd
│ └── Dockerfile │ └── Dockerfile
├── astra-linux/ # Astra Linux 1.7 с systemd ├── astra-linux/ # Astra Linux 1.7 с systemd
│ └── Dockerfile │ └── Dockerfile
@@ -378,10 +378,10 @@ docker run -d --privileged \
inecs/ansible-lab:rocky-latest inecs/ansible-lab:rocky-latest
``` ```
### 8. alt-linux ### 8. alt9
**Базовый образ:** `altlinux/p9` **Базовый образ:** `altlinux/p9`
**Тег:** `inecs/ansible-lab:alt-linux-latest` **Тег:** `inecs/ansible-lab:alt9-latest`
**Описание:** ALT Linux 9 с systemd и Docker **Описание:** ALT Linux 9 с systemd и Docker
#### Компоненты: #### Компоненты:
@@ -408,11 +408,11 @@ systemctl set-default multi-user.target
```bash ```bash
# Запуск ALT Linux контейнера # Запуск ALT Linux контейнера
docker run -d --privileged \ docker run -d --privileged \
--name alt-linux-test \ --name alt9-test \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
--tmpfs /run --tmpfs /run/lock \ --tmpfs /run --tmpfs /run/lock \
--cap-add SYS_ADMIN \ --cap-add SYS_ADMIN \
inecs/ansible-lab:alt-linux-latest inecs/ansible-lab:alt9-latest
``` ```
### 9. astra-linux ### 9. astra-linux
@@ -581,7 +581,7 @@ images:
centos: "inecs/ansible-lab:centos-latest" centos: "inecs/ansible-lab:centos-latest"
alma: "inecs/ansible-lab:alma-latest" alma: "inecs/ansible-lab:alma-latest"
rocky: "inecs/ansible-lab:rocky-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" astra: "inecs/ansible-lab:astra-linux-latest"
redos: "inecs/ansible-lab:redos-latest" redos: "inecs/ansible-lab:redos-latest"

6
docs/dockerfiles.md
View File

@@ -13,7 +13,7 @@ AnsibleLab использует предварительно собранные
``` ```
dockerfiles/ dockerfiles/
├── ansible-controller/ # Ansible контроллер ├── ansible-controller/ # Ansible контроллер
├── alt-linux/ # ALT Linux P9 ├── alt9/ # ALT Linux P9
├── astra-linux/ # Astra Linux 1.7 ├── astra-linux/ # Astra Linux 1.7
├── redos/ # RED OS 9 ├── redos/ # RED OS 9
├── rhel/ # Red Hat Enterprise Linux 8 ├── rhel/ # Red Hat Enterprise Linux 8
@@ -194,7 +194,7 @@ Red Hat Enterprise Linux 8 с systemd.
### ALT Linux ### ALT Linux
**Базовый образ:** `altlinux/p9` **Базовый образ:** `altlinux/p9`
**Тег:** `inecs/ansible-lab:alt-linux-latest` **Тег:** `inecs/ansible-lab:alt9-latest`
**Платформы:** linux/amd64 (ограничение базового образа) **Платформы:** linux/amd64 (ограничение базового образа)
ALT Linux P9 с systemd. ALT Linux P9 с systemd.
@@ -357,7 +357,7 @@ docker run -d --privileged \
| alma | amd64, arm64 | ✅ | ✅ | ✅ | | alma | amd64, arm64 | ✅ | ✅ | ✅ |
| rocky | amd64, arm64 | ✅ | ✅ | ✅ | | rocky | amd64, arm64 | ✅ | ✅ | ✅ |
| rhel | amd64, arm64 | ✅ | ✅ | ✅ | | rhel | amd64, arm64 | ✅ | ✅ | ✅ |
| alt-linux | amd64 | ✅ | ✅ | ✅ | | alt9 | amd64 | ✅ | ✅ | ✅ |
| astra-linux | amd64 | ✅ | ✅ | ✅ | | astra-linux | amd64 | ✅ | ✅ | ✅ |
| redos | amd64 | ✅ | ✅ | ✅ | | redos | amd64 | ✅ | ✅ | ✅ |

2
docs/molecule-guide.md
View File

@@ -131,7 +131,7 @@ vars:
docker_network: labnet docker_network: labnet
generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
images: images:
alt: "inecs/ansible-lab:alt-linux-latest" alt: "inecs/ansible-lab:alt9-latest"
astra: "inecs/ansible-lab:astra-linux-latest" astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest" rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest" centos: "inecs/ansible-lab:centos-latest"

3
molecule/default/create.yml
View File

@@ -10,7 +10,8 @@
docker_network: labnet docker_network: labnet
generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini" generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
images: 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" astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest" rhel: "inecs/ansible-lab:rhel-latest"
centos: "inecs/ansible-lab:centos-latest" centos: "inecs/ansible-lab:centos-latest"

2
molecule/default/molecule.yml
View File

@@ -17,7 +17,7 @@ platforms:
image: inecs/ansible-lab:ansible-controller-latest image: inecs/ansible-lab:ansible-controller-latest
pre_build_image: true pre_build_image: true
- name: alt-linux - name: alt-linux
image: inecs/ansible-lab:alt-linux-latest image: inecs/ansible-lab:alt9-latest
pre_build_image: true pre_build_image: true
- name: astra-linux - name: astra-linux
image: inecs/ansible-lab:astra-linux-latest image: inecs/ansible-lab:astra-linux-latest

2
molecule/presets/default.yml
View File

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

2
molecule/presets/examples/all-images.yml
View File

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

2
molecule/presets/examples/docker-full.yml
View File

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

2
molecule/presets/examples/docker-test.yml
View File

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

2
molecule/presets/examples/etcd-patroni.yml
View File

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

2
molecule/presets/examples/minimal.yml
View File

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

2
molecule/presets/examples/multi-os.yml
View File

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

2
molecule/presets/examples/performance.yml
View File

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

2
molecule/presets/examples/security.yml
View File

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

3
molecule/presets/examples/stable.yml
View File

@@ -8,7 +8,8 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
# systemd-ready образы # systemd-ready образы
images: 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" astra: "inecs/ansible-lab:astra-linux-latest"
rhel: "inecs/ansible-lab:rhel-latest" rhel: "inecs/ansible-lab:rhel-latest"
centos7: "inecs/ansible-lab:centos7-latest" centos7: "inecs/ansible-lab:centos7-latest"

2
molecule/presets/examples/standart.yml
View File

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

2
molecule/presets/examples/test.yml
View File

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

2
molecule/presets/mytest.yml
View File

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

6
scripts/test-custom-images.sh
View File

@@ -45,7 +45,7 @@ check_images() {
local images=( local images=(
"inecs/ansible-lab:ansible-controller-latest" "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:astra-linux-latest"
"inecs/ansible-lab:redos-latest" "inecs/ansible-lab:redos-latest"
"inecs/ansible-lab:rhel-latest" "inecs/ansible-lab:rhel-latest"
@@ -82,8 +82,8 @@ check_images() {
"inecs/ansible-lab:ansible-controller-latest") "inecs/ansible-lab:ansible-controller-latest")
echo " make docker build-image IMAGE=ansible-controller" echo " make docker build-image IMAGE=ansible-controller"
;; ;;
"inecs/ansible-lab:alt-linux-latest") "inecs/ansible-lab:alt9-latest")
echo " make docker build-image IMAGE=alt-linux" echo " make docker build-image IMAGE=alt9"
;; ;;
"inecs/ansible-lab:astra-linux-latest") "inecs/ansible-lab:astra-linux-latest")
echo " make docker build-image IMAGE=astra-linux" echo " make docker build-image IMAGE=astra-linux"