From 098d8b672f2e26cf178d55b2fe7e02ded0213b4d 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: Sat, 25 Oct 2025 23:22:50 +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=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=BE=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D1=8B=20=D0=9E?= =?UTF-8?q?=D0=A1=20=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Переименованы: ubuntu -> ubuntu22, centos -> centos9 - Добавлены новые версии: ubuntu20, ubuntu24, centos7, centos8 - Добавлены версии Debian: debian9, debian10, debian11, debian12 - Обновлен Makefile с новыми образами - Обновлен preset all-images.yml с новыми версиями --- Makefile | 4 +- dockerfiles/centos7/Dockerfile | 46 +++++++++ dockerfiles/centos8/Dockerfile | 46 +++++++++ dockerfiles/{centos => centos9}/Dockerfile | 0 dockerfiles/debian10/Dockerfile | 52 ++++++++++ dockerfiles/debian11/Dockerfile | 52 ++++++++++ dockerfiles/debian12/Dockerfile | 52 ++++++++++ dockerfiles/debian9/Dockerfile | 52 ++++++++++ dockerfiles/ubuntu20/Dockerfile | 52 ++++++++++ dockerfiles/{ubuntu => ubuntu22}/Dockerfile | 0 dockerfiles/ubuntu24/Dockerfile | 52 ++++++++++ molecule/presets/all-images.yml | 102 +++++++++++++++++--- 12 files changed, 492 insertions(+), 18 deletions(-) create mode 100644 dockerfiles/centos7/Dockerfile create mode 100644 dockerfiles/centos8/Dockerfile rename dockerfiles/{centos => centos9}/Dockerfile (100%) create mode 100644 dockerfiles/debian10/Dockerfile create mode 100644 dockerfiles/debian11/Dockerfile create mode 100644 dockerfiles/debian12/Dockerfile create mode 100644 dockerfiles/debian9/Dockerfile create mode 100644 dockerfiles/ubuntu20/Dockerfile rename dockerfiles/{ubuntu => ubuntu22}/Dockerfile (100%) create mode 100644 dockerfiles/ubuntu24/Dockerfile diff --git a/Makefile b/Makefile index 0cd6416..8ffa01b 100644 --- a/Makefile +++ b/Makefile @@ -31,14 +31,14 @@ CONTAINER_NAME ?= ansible-controller # Переменные для Docker Hub DOCKER_REGISTRY ?= inecs/ansible-lab DOCKER_VERSION ?= latest -DOCKER_IMAGES := ansible-controller alt-linux astra-linux redos rhel centos alma rocky ubuntu debian +DOCKER_IMAGES := ansible-controller alt-linux astra-linux redos rhel centos7 centos8 centos9 alma rocky ubuntu20 ubuntu22 ubuntu24 debian9 debian10 debian11 debian12 # Multi-arch поддержка DOCKER_PLATFORMS ?= linux/amd64,linux/arm64 DOCKER_BUILDX_BUILDER ?= multiarch-builder # Базовые образы и их теги -BASE_IMAGES := altlinux/p9 astralinux/astra-1.7 redos/redos:9 registry.access.redhat.com/ubi8/ubi quay.io/centos/centos:stream9 almalinux:8 rockylinux:8 +BASE_IMAGES := altlinux/p9 astralinux/astra-1.7 redos/redos:9 registry.access.redhat.com/ubi8/ubi centos:7 quay.io/centos/centos:8 quay.io/centos/centos:stream9 almalinux:8 rockylinux:8 ubuntu:20.04 ubuntu:22.04 ubuntu:24.04 debian:9 debian:10 debian:11 debian:bookworm .PHONY: role vault git docker presets controller help update-playbooks generate-docs setup-cicd list create delete diff --git a/dockerfiles/centos7/Dockerfile b/dockerfiles/centos7/Dockerfile new file mode 100644 index 0000000..96f1c1f --- /dev/null +++ b/dockerfiles/centos7/Dockerfile @@ -0,0 +1,46 @@ +# CentOS 7 с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM centos:7 + +# Обновляем систему +RUN yum update -y && yum upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN yum install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && yum clean all + +# Устанавливаем 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 +# RUN curl -fsSL https://get.docker.com | sh + +# Устанавливаем 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"] diff --git a/dockerfiles/centos8/Dockerfile b/dockerfiles/centos8/Dockerfile new file mode 100644 index 0000000..729e12f --- /dev/null +++ b/dockerfiles/centos8/Dockerfile @@ -0,0 +1,46 @@ +# CentOS 8 с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM quay.io/centos/centos:8 + +# Обновляем систему +RUN dnf update -y && dnf upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN dnf install -y --allowerasing \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && dnf clean all + +# Устанавливаем 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 +# RUN curl -fsSL https://get.docker.com | sh + +# Устанавливаем 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"] diff --git a/dockerfiles/centos/Dockerfile b/dockerfiles/centos9/Dockerfile similarity index 100% rename from dockerfiles/centos/Dockerfile rename to dockerfiles/centos9/Dockerfile diff --git a/dockerfiles/debian10/Dockerfile b/dockerfiles/debian10/Dockerfile new file mode 100644 index 0000000..d27f7fc --- /dev/null +++ b/dockerfiles/debian10/Dockerfile @@ -0,0 +1,52 @@ +# Debian 10 Buster с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM debian:10 + +# Обновляем систему +RUN apt-get update && apt-get dist-upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN apt-get install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && apt-get clean + +# Устанавливаем Docker вручную для Debian +# RUN apt-get update && apt-get install -y \ +# ca-certificates \ +# curl \ +# gnupg \ +# lsb-release \ +# && mkdir -p /usr/share/keyrings \ +# && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ +# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ +# && apt-get update \ +# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ +# && 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"] diff --git a/dockerfiles/debian11/Dockerfile b/dockerfiles/debian11/Dockerfile new file mode 100644 index 0000000..6e6e732 --- /dev/null +++ b/dockerfiles/debian11/Dockerfile @@ -0,0 +1,52 @@ +# Debian 11 Bullseye с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM debian:11 + +# Обновляем систему +RUN apt-get update && apt-get dist-upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN apt-get install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && apt-get clean + +# Устанавливаем Docker вручную для Debian +# RUN apt-get update && apt-get install -y \ +# ca-certificates \ +# curl \ +# gnupg \ +# lsb-release \ +# && mkdir -p /usr/share/keyrings \ +# && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ +# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ +# && apt-get update \ +# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ +# && 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"] diff --git a/dockerfiles/debian12/Dockerfile b/dockerfiles/debian12/Dockerfile new file mode 100644 index 0000000..d80bf4a --- /dev/null +++ b/dockerfiles/debian12/Dockerfile @@ -0,0 +1,52 @@ +# Debian 12 Bookworm с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM debian:bookworm + +# Обновляем систему +RUN apt-get update && apt-get dist-upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN apt-get install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && apt-get clean + +# Устанавливаем Docker вручную для Debian +# RUN apt-get update && apt-get install -y \ +# ca-certificates \ +# curl \ +# gnupg \ +# lsb-release \ +# && mkdir -p /usr/share/keyrings \ +# && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ +# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ +# && apt-get update \ +# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ +# && 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"] diff --git a/dockerfiles/debian9/Dockerfile b/dockerfiles/debian9/Dockerfile new file mode 100644 index 0000000..fb3568e --- /dev/null +++ b/dockerfiles/debian9/Dockerfile @@ -0,0 +1,52 @@ +# Debian 9 Stretch с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM debian:9 + +# Обновляем систему +RUN apt-get update && apt-get dist-upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN apt-get install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && apt-get clean + +# Устанавливаем Docker вручную для Debian +# RUN apt-get update && apt-get install -y \ +# ca-certificates \ +# curl \ +# gnupg \ +# lsb-release \ +# && mkdir -p /usr/share/keyrings \ +# && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ +# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ +# && apt-get update \ +# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ +# && 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"] diff --git a/dockerfiles/ubuntu20/Dockerfile b/dockerfiles/ubuntu20/Dockerfile new file mode 100644 index 0000000..9079f39 --- /dev/null +++ b/dockerfiles/ubuntu20/Dockerfile @@ -0,0 +1,52 @@ +# Ubuntu 20.04 с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM ubuntu:20.04 + +# Обновляем систему +RUN apt-get update && apt-get dist-upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN apt-get install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && apt-get clean + +# Устанавливаем Docker вручную для Ubuntu +# RUN apt-get update && apt-get install -y \ +# ca-certificates \ +# curl \ +# gnupg \ +# lsb-release \ +# && mkdir -p /usr/share/keyrings \ +# && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ +# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ +# && apt-get update \ +# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ +# && 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"] diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu22/Dockerfile similarity index 100% rename from dockerfiles/ubuntu/Dockerfile rename to dockerfiles/ubuntu22/Dockerfile diff --git a/dockerfiles/ubuntu24/Dockerfile b/dockerfiles/ubuntu24/Dockerfile new file mode 100644 index 0000000..3149bf0 --- /dev/null +++ b/dockerfiles/ubuntu24/Dockerfile @@ -0,0 +1,52 @@ +# Ubuntu 24.04 с systemd +# Автор: Сергей Антропов +# Сайт: https://devops.org.ru + +FROM ubuntu:24.04 + +# Обновляем систему +RUN apt-get update && apt-get dist-upgrade -y + +# Устанавливаем systemd и необходимые пакеты +RUN apt-get install -y \ + systemd \ + systemd-sysv \ + dbus \ + curl \ + wget \ + nano \ + python3 \ + python3-pip \ + sudo \ + && apt-get clean + +# Устанавливаем Docker вручную для Ubuntu +# RUN apt-get update && apt-get install -y \ +# ca-certificates \ +# curl \ +# gnupg \ +# lsb-release \ +# && mkdir -p /usr/share/keyrings \ +# && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ +# && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ +# && apt-get update \ +# && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ +# && 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"] diff --git a/molecule/presets/all-images.yml b/molecule/presets/all-images.yml index bf6de05..9aab60a 100644 --- a/molecule/presets/all-images.yml +++ b/molecule/presets/all-images.yml @@ -12,12 +12,19 @@ images: alt: "inecs/ansible-lab:alt-linux-latest" astra: "inecs/ansible-lab:astra-linux-latest" rhel: "inecs/ansible-lab:rhel-latest" - centos: "inecs/ansible-lab:centos-latest" + centos7: "inecs/ansible-lab:centos7-latest" + centos8: "inecs/ansible-lab:centos8-latest" + centos9: "inecs/ansible-lab:centos9-latest" alma: "inecs/ansible-lab:alma-latest" rocky: "inecs/ansible-lab:rocky-latest" redos: "inecs/ansible-lab:redos-latest" - ubuntu: "inecs/ansible-lab:ubuntu-latest" - debian: "inecs/ansible-lab:debian-latest" + ubuntu20: "inecs/ansible-lab:ubuntu20-latest" + ubuntu22: "inecs/ansible-lab:ubuntu22-latest" + ubuntu24: "inecs/ansible-lab:ubuntu24-latest" + debian9: "inecs/ansible-lab:debian9-latest" + debian10: "inecs/ansible-lab:debian10-latest" + debian11: "inecs/ansible-lab:debian11-latest" + debian12: "inecs/ansible-lab:debian12-latest" systemd_defaults: privileged: true @@ -29,22 +36,67 @@ systemd_defaults: hosts: # Debian-based системы - - name: ubuntu-test - family: ubuntu - groups: [test, debian] + - name: ubuntu20-test + family: ubuntu20 + groups: [test, debian, ubuntu] publish: - "8080:80" env: - TEST_OS: "Ubuntu" + TEST_OS: "Ubuntu 20.04" TEST_FAMILY: "Debian" - - name: debian-test - family: debian - groups: [test, debian] + - name: ubuntu22-test + family: ubuntu22 + groups: [test, debian, ubuntu] publish: - "8081:80" env: - TEST_OS: "Debian" + TEST_OS: "Ubuntu 22.04" + TEST_FAMILY: "Debian" + + - name: ubuntu24-test + family: ubuntu24 + groups: [test, debian, ubuntu] + publish: + - "8082:80" + env: + TEST_OS: "Ubuntu 24.04" + TEST_FAMILY: "Debian" + + - name: debian9-test + family: debian9 + groups: [test, debian] + publish: + - "8083:80" + env: + TEST_OS: "Debian 9" + TEST_FAMILY: "Debian" + + - name: debian10-test + family: debian10 + groups: [test, debian] + publish: + - "8084:80" + env: + TEST_OS: "Debian 10" + TEST_FAMILY: "Debian" + + - name: debian11-test + family: debian11 + groups: [test, debian] + publish: + - "8085:80" + env: + TEST_OS: "Debian 11" + TEST_FAMILY: "Debian" + + - name: debian12-test + family: debian12 + groups: [test, debian] + publish: + - "8086:80" + env: + TEST_OS: "Debian 12" TEST_FAMILY: "Debian" - name: alt-test @@ -67,13 +119,31 @@ hosts: TEST_FAMILY: "Astra Linux" # RHEL-based системы - - name: centos-test - family: centos - groups: [test, rhel] + - name: centos7-test + family: centos7 + groups: [test, rhel, centos] publish: - - "8084:80" + - "8090:80" env: - TEST_OS: "CentOS" + TEST_OS: "CentOS 7" + TEST_FAMILY: "RedHat" + + - name: centos8-test + family: centos8 + groups: [test, rhel, centos] + publish: + - "8091:80" + env: + TEST_OS: "CentOS 8" + TEST_FAMILY: "RedHat" + + - name: centos9-test + family: centos9 + groups: [test, rhel, centos] + publish: + - "8092:80" + env: + TEST_OS: "CentOS 9" TEST_FAMILY: "RedHat" - name: rhel-test