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

Добавлены новые версии образов в docker-get-base-tag: centos7/8/9, ubuntu20/22/24, debian9/10/11/12

Browse Source
This commit is contained in:
Сергей Антропов
2025-10-25 23:25:20 +03:00
parent 098d8b672f
commit e638f7cc94
11 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Makefile
View File

@@ -842,7 +842,17 @@ docker-get-base-tag:
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");; \
centos) \ centos7) \
BASE_IMAGE="centos:7"; \
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");; \
centos8) \
BASE_IMAGE="quay.io/centos/centos:8"; \
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");; \
centos9) \
BASE_IMAGE="quay.io/centos/centos:stream9"; \ BASE_IMAGE="quay.io/centos/centos:stream9"; \
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; \
@@ -857,12 +867,37 @@ docker-get-base-tag:
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");; \
ubuntu) \ ubuntu20) \
BASE_IMAGE="ubuntu:20.04"; \
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");; \
ubuntu22) \
BASE_IMAGE="ubuntu:22.04"; \ BASE_IMAGE="ubuntu:22.04"; \
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");; \
debian) \ ubuntu24) \
BASE_IMAGE="ubuntu:24.04"; \
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");; \
debian9) \
BASE_IMAGE="debian:9"; \
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");; \
debian10) \
BASE_IMAGE="debian:10"; \
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");; \
debian11) \
BASE_IMAGE="debian:11"; \
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");; \
debian12) \
BASE_IMAGE="debian:bookworm"; \ BASE_IMAGE="debian:bookworm"; \
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; \

17
molecule/presets/default.yml
View File

@@ -11,12 +11,19 @@ images:
alt: "inecs/ansible-lab:alt-linux-latest" alt: "inecs/ansible-lab:alt-linux-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" centos7: "inecs/ansible-lab:centos7-latest"
centos8: "inecs/ansible-lab:centos8-latest"
centos9: "inecs/ansible-lab:centos9-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"
redos: "inecs/ansible-lab:redos-latest" redos: "inecs/ansible-lab:redos-latest"
ubuntu: "inecs/ansible-lab:ubuntu-latest" ubuntu20: "inecs/ansible-lab:ubuntu20-latest"
debian: "inecs/ansible-lab:debian-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: systemd_defaults:
privileged: true privileged: true
@@ -29,8 +36,8 @@ systemd_defaults:
hosts: hosts:
# Стандартный набор - 2 хоста для базового тестирования (стабильные ОС) # Стандартный набор - 2 хоста для базового тестирования (стабильные ОС)
- name: u1 - name: u1
family: ubuntu family: ubuntu22
groups: [test, web] groups: [test, web]
- name: u2 - name: u2
family: debian family: debian12
groups: [test, web] groups: [test, web]

6
molecule/presets/docker-full.yml
View File

@@ -29,10 +29,10 @@ systemd_defaults:
hosts: hosts:
# Базовые хосты (стабильные ОС) # Базовые хосты (стабильные ОС)
- name: u1 - name: u1
family: ubuntu family: ubuntu22
groups: [test, web] groups: [test, web]
- name: u2 - name: u2
family: debian family: debian12
groups: [test, web] groups: [test, web]
# DinD узел (Docker-in-Docker) # DinD узел (Docker-in-Docker)
@@ -44,7 +44,7 @@ hosts:
# DOoD узел (Docker-out-of-Docker) # DOoD узел (Docker-out-of-Docker)
- name: dood1 - name: dood1
type: dood type: dood
family: ubuntu family: ubuntu22
groups: [dood] groups: [dood]
publish: ["8081:8081"] publish: ["8081:8081"]
env: env:

4
molecule/presets/docker-test.yml
View File

@@ -29,7 +29,7 @@ systemd_defaults:
hosts: hosts:
# Тестовые хосты # Тестовые хосты
- name: test1 - name: test1
family: debian family: debian12
groups: [test] groups: [test]
- name: test2 - name: test2
family: rhel family: rhel
@@ -44,7 +44,7 @@ hosts:
# DOoD узел (Docker-out-of-Docker) # DOoD узел (Docker-out-of-Docker)
- name: dood1 - name: dood1
type: dood type: dood
family: debian family: debian12
groups: [dood] groups: [dood]
publish: ["8081:8081"] publish: ["8081:8081"]
env: env:

10
molecule/presets/etcd-patroni.yml
View File

@@ -30,19 +30,19 @@ systemd_defaults:
hosts: hosts:
# ETCD кластер (5 узлов для высокой доступности) # ETCD кластер (5 узлов для высокой доступности)
- name: etcd1 - name: etcd1
family: debian family: debian12
groups: [etcd, cluster] groups: [etcd, cluster]
- name: etcd2 - name: etcd2
family: rhel family: rhel
groups: [etcd, cluster] groups: [etcd, cluster]
- name: etcd3 - name: etcd3
family: debian family: debian12
groups: [etcd, cluster] groups: [etcd, cluster]
- name: etcd4 - name: etcd4
family: rhel family: rhel
groups: [etcd, cluster] groups: [etcd, cluster]
- name: etcd5 - name: etcd5
family: debian family: debian12
groups: [etcd, cluster] groups: [etcd, cluster]
# Patroni кластер (3 узла PostgreSQL) # Patroni кластер (3 узла PostgreSQL)
@@ -50,7 +50,7 @@ hosts:
family: rhel family: rhel
groups: [patroni, database, cluster] groups: [patroni, database, cluster]
- name: patroni2 - name: patroni2
family: debian family: debian12
groups: [patroni, database, cluster] groups: [patroni, database, cluster]
- name: patroni3 - name: patroni3
family: rhel family: rhel
@@ -58,7 +58,7 @@ hosts:
# HAProxy для балансировки # HAProxy для балансировки
- name: haproxy - name: haproxy
family: debian family: debian12
groups: [haproxy, loadbalancer] groups: [haproxy, loadbalancer]
publish: ["5000:5000", "5001:5001"] # RW и RO порты publish: ["5000:5000", "5001:5001"] # RW и RO порты

12
molecule/presets/multi-os.yml
View File

@@ -30,16 +30,16 @@ systemd_defaults:
hosts: hosts:
# Debian серверы # Debian серверы
- name: debian1 - name: debian1
family: debian family: debian12
groups: [debian, servers, web] groups: [debian, servers, web]
- name: debian2 - name: debian2
family: debian family: debian12
groups: [debian, servers, web] groups: [debian, servers, web]
- name: debian3 - name: debian3
family: debian family: debian12
groups: [debian, servers, app] groups: [debian, servers, app]
- name: debian4 - name: debian4
family: debian family: debian12
groups: [debian, servers, app] groups: [debian, servers, app]
# RHEL серверы # RHEL серверы
@@ -58,7 +58,7 @@ hosts:
# База данных на разных ОС # База данных на разных ОС
- name: db-debian - name: db-debian
family: debian family: debian12
groups: [database, debian, db] groups: [database, debian, db]
- name: db-rhel - name: db-rhel
family: rhel family: rhel
@@ -66,7 +66,7 @@ hosts:
# Load balancer # Load balancer
- name: lb-mixed - name: lb-mixed
family: debian family: debian12
groups: [loadbalancer, haproxy] groups: [loadbalancer, haproxy]
publish: ["80:80", "443:443"] publish: ["80:80", "443:443"]

12
molecule/presets/performance.yml
View File

@@ -30,19 +30,19 @@ systemd_defaults:
hosts: hosts:
# Основные серверы (5 узлов) # Основные серверы (5 узлов)
- name: server1 - name: server1
family: debian family: debian12
groups: [servers, web, app] groups: [servers, web, app]
- name: server2 - name: server2
family: rhel family: rhel
groups: [servers, web, app] groups: [servers, web, app]
- name: server3 - name: server3
family: debian family: debian12
groups: [servers, web, app] groups: [servers, web, app]
- name: server4 - name: server4
family: rhel family: rhel
groups: [servers, web, app] groups: [servers, web, app]
- name: server5 - name: server5
family: debian family: debian12
groups: [servers, web, app] groups: [servers, web, app]
# База данных (3 узла) # База данных (3 узла)
@@ -50,7 +50,7 @@ hosts:
family: rhel family: rhel
groups: [database, db] groups: [database, db]
- name: db2 - name: db2
family: debian family: debian12
groups: [database, db] groups: [database, db]
- name: db3 - name: db3
family: rhel family: rhel
@@ -58,13 +58,13 @@ hosts:
# Кэш (3 узла Redis) # Кэш (3 узла Redis)
- name: cache1 - name: cache1
family: debian family: debian12
groups: [cache, redis] groups: [cache, redis]
- name: cache2 - name: cache2
family: rhel family: rhel
groups: [cache, redis] groups: [cache, redis]
- name: cache3 - name: cache3
family: debian family: debian12
groups: [cache, redis] groups: [cache, redis]
# Load balancer # Load balancer

12
molecule/presets/security.yml
View File

@@ -34,7 +34,7 @@ hosts:
groups: [bastion, security, jump] groups: [bastion, security, jump]
publish: ["2222:22"] publish: ["2222:22"]
- name: bastion2 - name: bastion2
family: debian family: debian12
groups: [bastion, security, jump] groups: [bastion, security, jump]
publish: ["2223:22"] publish: ["2223:22"]
@@ -43,7 +43,7 @@ hosts:
family: rhel family: rhel
groups: [internal, servers, app] groups: [internal, servers, app]
- name: internal2 - name: internal2
family: debian family: debian12
groups: [internal, servers, app] groups: [internal, servers, app]
- name: internal3 - name: internal3
family: rhel family: rhel
@@ -54,12 +54,12 @@ hosts:
family: rhel family: rhel
groups: [database, secure, internal] groups: [database, secure, internal]
- name: db-secure2 - name: db-secure2
family: debian family: debian12
groups: [database, secure, internal] groups: [database, secure, internal]
# Мониторинг и логирование # Мониторинг и логирование
- name: monitor1 - name: monitor1
family: debian family: debian12
groups: [monitoring, security, logs] groups: [monitoring, security, logs]
- name: monitor2 - name: monitor2
family: rhel family: rhel
@@ -70,13 +70,13 @@ hosts:
family: rhel family: rhel
groups: [firewall, network, security] groups: [firewall, network, security]
- name: fw2 - name: fw2
family: debian family: debian12
groups: [firewall, network, security] groups: [firewall, network, security]
# DOoD узел для тестирования Docker безопасности # DOoD узел для тестирования Docker безопасности
- name: docker-secure - name: docker-secure
type: dood type: dood
family: debian family: debian12
groups: [docker, security, apps] groups: [docker, security, apps]
publish: ["8080:8080"] publish: ["8080:8080"]
env: env:

4
molecule/presets/stable.yml
View File

@@ -29,8 +29,8 @@ systemd_defaults:
hosts: hosts:
# Стабильные ОС для надежного тестирования # Стабильные ОС для надежного тестирования
- name: u1 - name: u1
family: ubuntu family: ubuntu22
groups: [test, web] groups: [test, web]
- name: u2 - name: u2
family: debian family: debian12
groups: [test, web] groups: [test, web]

4
molecule/presets/standart.yml
View File

@@ -29,11 +29,11 @@ systemd_defaults:
hosts: hosts:
# Стандартный набор - 3 хоста # Стандартный набор - 3 хоста
- name: u1 - name: u1
family: debian family: debian12
groups: [test] groups: [test]
- name: u2 - name: u2
family: rhel family: rhel
groups: [test] groups: [test]
- name: u3 - name: u3
family: debian family: debian12
groups: [test] groups: [test]

2
molecule/presets/test.yml
View File

@@ -29,5 +29,5 @@ systemd_defaults:
hosts: hosts:
# Минимальный набор - один хост # Минимальный набор - один хост
- name: u1 - name: u1
family: debian family: debian12
groups: [test] groups: [test]