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

Обновлен Makefile: добавлены alt9/alt10, исправлен redos, добавлена поддержка AMD64 для astra-linux и redos
Some checks are pending
Ansible Testing / lint (push) Waiting to run
Details
Ansible Testing / test (default) (push) Blocked by required conditions
Details
Ansible Testing / test (minimal) (push) Blocked by required conditions
Details
Ansible Testing / test (performance) (push) Blocked by required conditions
Details
Ansible Testing / deploy-check (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Сергей Антропов
2025-10-27 11:16:50 +03:00
parent 37ff18c91b
commit 8734519be2
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@@ -32,7 +32,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
@@ -496,9 +496,14 @@ docker:
echo "✅ Образы отправлены в Docker Hub";; \
pull) \
echo "📥 Загрузка Docker образов из Docker Hub..."; \
echo "⚠️ ВНИМАНИЕ: astra-linux и redos собираются только для AMD64"; \
for image in $(DOCKER_IMAGES); do \
echo "📥 Загрузка $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION)"; \
if [ "$$image" = "astra-linux" ] || [ "$$image" = "redos" ]; then \
docker pull --platform linux/amd64 $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION) || echo "⚠️ Образ $$image не найден в Docker Hub"; \
else \
docker pull $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION) || echo "⚠️ Образ $$image не найден в Docker Hub"; \
fi; \
done; \
echo "✅ Загрузка завершена";; \
clean) \
@@ -823,21 +828,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; \