From 9f6ec970a47aed695e77de6d0d713083325f80eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BF=D0=BE=D0=B2?= Date: Sat, 25 Oct 2025 23:06:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D1=81=D0=B1=D0=BE?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20RED=20OS=20=D0=B8=20Astra=20Linux=20=D1=82?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B4=D0=BB=D1=8F=20AMD64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Добавлена проверка имени образа в docker-build-image - RED OS и Astra Linux автоматически собираются только для linux/amd64 - Остальные образы собираются для всех платформ (AMD64 + ARM64) - Добавлено предупреждение при сборке AMD64-only образов --- Makefile | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 58816e5..7b73cdd 100644 --- a/Makefile +++ b/Makefile @@ -878,17 +878,30 @@ docker-build-image: exit 1; \ fi; \ TAG=$$($(MAKE) docker-get-base-tag IMAGE=$(IMAGE)); \ - echo ""; \ - echo "=========================================="; \ - echo "🔨 СБОРКА ОБРАЗА: $(DOCKER_REGISTRY):$(IMAGE)-$$TAG"; \ - echo "📋 Платформы: $(DOCKER_PLATFORMS)"; \ - echo "📋 Тег: $$TAG"; \ - echo "📋 Registry: $(DOCKER_REGISTRY)"; \ - echo "=========================================="; \ + if [ "$(IMAGE)" = "redos" ] || [ "$(IMAGE)" = "astra-linux" ]; then \ + PLATFORMS="linux/amd64"; \ + echo ""; \ + echo "=========================================="; \ + echo "🔨 СБОРКА ОБРАЗА: $(DOCKER_REGISTRY):$(IMAGE)-$$TAG"; \ + echo "📋 Платформы: $$PLATFORMS (только AMD64)"; \ + echo "📋 Тег: $$TAG"; \ + echo "📋 Registry: $(DOCKER_REGISTRY)"; \ + echo "⚠️ ВНИМАНИЕ: Базовый образ поддерживает только AMD64"; \ + echo "=========================================="; \ + else \ + PLATFORMS="$(DOCKER_PLATFORMS)"; \ + echo ""; \ + echo "=========================================="; \ + echo "🔨 СБОРКА ОБРАЗА: $(DOCKER_REGISTRY):$(IMAGE)-$$TAG"; \ + echo "📋 Платформы: $$PLATFORMS"; \ + echo "📋 Тег: $$TAG"; \ + echo "📋 Registry: $(DOCKER_REGISTRY)"; \ + echo "=========================================="; \ + fi; \ echo ""; \ cd dockerfiles/$(IMAGE) && \ docker buildx build \ - --platform $(DOCKER_PLATFORMS) \ + --platform $$PLATFORMS \ --tag $(DOCKER_REGISTRY):$(IMAGE)-$$TAG \ --tag $(DOCKER_REGISTRY):$(IMAGE)-latest \ --push \