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

Исправлено: make docker pull теперь корректно обрабатывает astra-linux и redos для ARM64
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Details
Ansible Testing / test (default) (push) Has been cancelled
Details
Ansible Testing / test (minimal) (push) Has been cancelled
Details
Ansible Testing / test (performance) (push) Has been cancelled
Details
Ansible Testing / deploy-check (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Сергей Антропов
2025-10-27 10:38:06 +03:00
parent 5169310c35
commit fbf6c3e813
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

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