diff --git a/Makefile b/Makefile index e9edc0e..e1a1811 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ DOCKER_DIND_IMAGE ?= docker:27-dind CONTAINER_NAME ?= ansible-controller # Переменные для Docker Hub -DOCKER_REGISTRY ?= inecs +DOCKER_REGISTRY ?= inecs/ansible-lab DOCKER_VERSION ?= latest DOCKER_IMAGES := ansible-controller alt-linux astra-linux redos rhel centos alma rocky @@ -376,6 +376,9 @@ docker: echo "🐳 Сборка Docker образов (multi-arch)..."; \ echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \ echo "📋 Builder: $(DOCKER_BUILDX_BUILDER)"; \ + echo "📋 Registry: $(DOCKER_REGISTRY)"; \ + echo "📋 Version: $(DOCKER_VERSION)"; \ + echo "📋 Images: $(DOCKER_IMAGES)"; \ echo ""; \ $(MAKE) docker setup-builder; \ for image in $(DOCKER_IMAGES); do \ @@ -387,43 +390,46 @@ docker: echo "🔄 Полная пересборка Docker образов (multi-arch)..."; \ echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \ echo "📋 Builder: $(DOCKER_BUILDX_BUILDER)"; \ + echo "📋 Registry: $(DOCKER_REGISTRY)"; \ + echo "📋 Version: $(DOCKER_VERSION)"; \ + echo "📋 Images: $(DOCKER_IMAGES)"; \ echo "🧹 Очистка кеша и старых образов..."; \ echo ""; \ $(MAKE) docker clean; \ $(MAKE) docker clean-builder; \ $(MAKE) docker setup-builder; \ for image in $(DOCKER_IMAGES); do \ - echo "🔨 Пересборка $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION)"; \ + echo "🔨 Пересборка $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION)"; \ $(MAKE) docker-build-image IMAGE=$$image; \ done; \ echo "✅ Образы пересобраны с нуля";; \ push) \ echo "📤 Отправка Docker образов в Docker Hub..."; \ for image in $(DOCKER_IMAGES); do \ - echo "📤 Отправка $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION)"; \ - docker push $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION); \ + echo "📤 Отправка $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION)"; \ + docker push $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION); \ done; \ echo "✅ Образы отправлены в Docker Hub";; \ pull) \ echo "📥 Загрузка Docker образов из Docker Hub..."; \ for image in $(DOCKER_IMAGES); do \ - echo "📥 Загрузка $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION)"; \ - docker pull $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION) || echo "⚠️ Образ $$image не найден в Docker Hub"; \ + echo "📥 Загрузка $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION)"; \ + docker pull $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION) || echo "⚠️ Образ $$image не найден в Docker Hub"; \ done; \ echo "✅ Загрузка завершена";; \ clean) \ echo "🧹 Очистка Docker образов..."; \ for image in $(DOCKER_IMAGES); do \ - echo "🗑️ Удаление $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION)"; \ - docker rmi $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION) 2>/dev/null || true; \ + echo "🗑️ Удаление $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION)"; \ + docker rmi $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION) 2>/dev/null || true; \ done; \ echo "✅ Образы очищены";; \ info) \ echo "📊 Информация об образах..."; \ for image in $(DOCKER_IMAGES); do \ - if docker images | grep -q "$(DOCKER_REGISTRY)/$$image"; then \ - echo "📦 $(DOCKER_REGISTRY)/$$image:$(DOCKER_VERSION)"; \ - docker images | grep "$(DOCKER_REGISTRY)/$$image" | head -1; \ + if docker images | grep -q "$(DOCKER_REGISTRY):$$image"; then \ + echo "📦 $(DOCKER_REGISTRY):$$image-$(DOCKER_VERSION)"; \ + docker images | grep "$(DOCKER_REGISTRY):$$image" | head -1; \ fi; \ done;; \ update) \ @@ -578,15 +584,24 @@ docker-build-image: exit 1; \ fi; \ TAG=$$($(MAKE) docker-get-base-tag IMAGE=$(IMAGE)); \ - echo "🔨 Сборка $(DOCKER_REGISTRY)/$(IMAGE):$$TAG"; \ + echo ""; \ + echo "=========================================="; \ + echo "🔨 СБОРКА ОБРАЗА: $(DOCKER_REGISTRY):$(IMAGE)-$$TAG"; \ + echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \ + echo "📋 Тег: $$TAG"; \ + echo "📋 Registry: $(DOCKER_REGISTRY)"; \ + echo "=========================================="; \ + echo ""; \ cd dockerfiles/$(IMAGE) && \ docker buildx build \ --platform $(DOCKER_PLATFORMS) \ - --tag $(DOCKER_REGISTRY)/$(IMAGE):$$TAG \ - --tag $(DOCKER_REGISTRY)/$(IMAGE):latest \ + --tag $(DOCKER_REGISTRY):$(IMAGE)-$$TAG \ + --tag $(DOCKER_REGISTRY):$(IMAGE)-latest \ --push \ .; \ - echo "✅ $(IMAGE):$$TAG собран и отправлен" + echo ""; \ + echo "✅ УСПЕШНО: $(DOCKER_REGISTRY):$(IMAGE)-$$TAG собран и отправлен"; \ + echo "==========================================" # ============================================================================= diff --git a/dockerfiles/ansible-controller/Dockerfile b/dockerfiles/ansible-controller/Dockerfile index cc35de7..5ef8e51 100644 --- a/dockerfiles/ansible-controller/Dockerfile +++ b/dockerfiles/ansible-controller/Dockerfile @@ -51,10 +51,10 @@ RUN curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-amd64 \ && chmod +x ./kind \ && mv ./kind /usr/local/bin/ -# Устанавливаем Istio CLI -RUN curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.22.1 sh - \ - && mv istio-1.22.1/bin/istioctl /usr/local/bin/ \ - && rm -rf istio-1.22.1 +## Устанавливаем Istio CLI +#RUN curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.22.1 sh - \ +# && mv istio-1.22.1/bin/istioctl /usr/local/bin/ \ +# && rm -rf istio-1.22.1 # Копируем requirements.yml COPY requirements.yml /tmp/requirements.yml