diff --git a/Makefile b/Makefile index 519cda2..0f120ec 100644 --- a/Makefile +++ b/Makefile @@ -377,7 +377,7 @@ docker: echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \ echo "📋 Builder: $(DOCKER_BUILDX_BUILDER)"; \ echo ""; \ - $(MAKE) docker-setup-builder; \ + $(MAKE) docker setup-builder; \ for image in $(DOCKER_IMAGES); do \ echo "🔨 Сборка $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION)"; \ $(MAKE) docker-build-image IMAGE=$$image; \ @@ -549,9 +549,6 @@ docker-get-base-tag: echo "❌ Неизвестный образ: $(IMAGE)"; \ exit 1;; \ esac; \ - echo "📋 Образ: $(IMAGE)"; \ - echo "📋 Базовый образ: $$BASE_IMAGE"; \ - echo "📋 Тег: $$TAG"; \ echo "$$TAG" # Сборка одного образа с multi-arch @@ -580,7 +577,7 @@ controller: build) \ echo "🔨 Сборка ansible-controller (multi-arch)..."; \ echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \ - $(MAKE) docker-setup-builder; \ + $(MAKE) docker setup-builder; \ cd dockerfiles/ansible-controller && \ docker buildx build \ --platform $(DOCKER_PLATFORMS) \ diff --git a/dockerfiles/ansible-controller/Dockerfile b/dockerfiles/ansible-controller/Dockerfile index 8a4bbf3..cc35de7 100644 --- a/dockerfiles/ansible-controller/Dockerfile +++ b/dockerfiles/ansible-controller/Dockerfile @@ -57,7 +57,7 @@ RUN curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.22.1 sh - \ && rm -rf istio-1.22.1 # Копируем requirements.yml -COPY dockerfiles/ansible-controller/requirements.yml /tmp/requirements.yml +COPY requirements.yml /tmp/requirements.yml # Устанавливаем Ansible коллекции RUN ansible-galaxy collection install -r /tmp/requirements.yml