Оптимизация Dockerfile: убраны лишние пакеты и закомментированы Docker/yq
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Ansible Testing / test (default) (push) Has been cancelled
Ansible Testing / test (minimal) (push) Has been cancelled
Ansible Testing / test (performance) (push) Has been cancelled
Ansible Testing / deploy-check (push) Has been cancelled
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Ansible Testing / test (default) (push) Has been cancelled
Ansible Testing / test (minimal) (push) Has been cancelled
Ansible Testing / test (performance) (push) Has been cancelled
Ansible Testing / deploy-check (push) Has been cancelled
- Убраны пакеты: vim, jq, git, htop, tree из всех Dockerfile - Закомментированы установки Docker, Docker Compose, yq - Обновлен Rocky Linux до версии 9 с Python 3 - Исправлена проблема с passlib в ansible-controller - Оставлены только необходимые пакеты: systemd, curl, wget, nano, python3, sudo
This commit is contained in:
19
Makefile
19
Makefile
@@ -915,6 +915,20 @@ controller:
|
||||
--push \
|
||||
.; \
|
||||
echo "✅ ansible-controller собран и отправлен";; \
|
||||
rebuild) \
|
||||
echo "🔄 Пересборка ansible-controller с исправлениями..."; \
|
||||
echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \
|
||||
echo "🔧 Исправления: добавлен passlib для хеширования паролей"; \
|
||||
$(MAKE) docker setup-builder; \
|
||||
cd dockerfiles/ansible-controller && \
|
||||
docker buildx build \
|
||||
--platform $(DOCKER_PLATFORMS) \
|
||||
--tag $(DOCKER_REGISTRY):ansible-controller-$(DOCKER_VERSION) \
|
||||
--tag $(DOCKER_REGISTRY):ansible-controller-latest \
|
||||
--push \
|
||||
--no-cache \
|
||||
.; \
|
||||
echo "✅ ansible-controller пересобран с исправлениями";; \
|
||||
run) \
|
||||
echo "🚀 Запуск ansible-controller..."; \
|
||||
cd dockerfiles/ansible-controller && docker-compose up -d; \
|
||||
@@ -932,6 +946,11 @@ controller:
|
||||
echo " 💡 Использует: dockerfiles/ansible-controller/Dockerfile"; \
|
||||
echo " 💡 Requirements: dockerfiles/ansible-controller/requirements.yml"; \
|
||||
echo ""; \
|
||||
echo " 🔄 make controller rebuild - пересобрать ansible-controller с исправлениями"; \
|
||||
echo " 💡 Пересобирает: с --no-cache для применения исправлений"; \
|
||||
echo " 💡 Исправления: добавлен passlib для хеширования паролей"; \
|
||||
echo " 💡 Платформы: $(DOCKER_PLATFORMS)"; \
|
||||
echo ""; \
|
||||
echo " 🚀 make controller run - запустить ansible-controller"; \
|
||||
echo " 💡 Запускает: docker-compose up -d"; \
|
||||
echo " 💡 Использует: dockerfiles/ansible-controller/docker-compose.yml"; \
|
||||
|
||||
Reference in New Issue
Block a user