use buildx

Signed-off-by: Eitan Yarmush <eitan.yarmush@solo.io>

Author: EItanya

.github/workflows/tag.yaml

@@ -37,7 +37,6 @@ jobs:
     - name: 'Build Images'
       env:
         DOCKER_BUILD_ARGS: "--push --platform linux/amd64,linux/arm64"
-        DOCKER_BUILDER: "docker buildx"
       run: |
         # if workflow_dispatch is used, use the version input
         if [ -n "${{ github.event.inputs.version }}" ]; then

Makefile

@@ -9,6 +9,9 @@ VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null | sed 's/-di
 
 MCP_IMAGE_NAME ?= mcp
 
+# Local architecture detection to build for the current platform
+LOCALARCH ?= $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
+
 DOCKER_BUILDER ?= docker buildx
 DOCKER_BUILD_ARGS ?= --progress=plain --builder $(BUILDX_BUILDER_NAME) --pull --load --platform linux/$(LOCALARCH)
 
@@ -17,4 +20,4 @@ BUILDX_BUILDER_NAME=kagent-builder
 
 # Build the MCP image
 build-mcp:
-	docker build -t $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):$(VERSION) -t $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):latest -f mcp/Dockerfile ./mcp
+	$(DOCKER_BUILDER) build $(DOCKER_BUILD_ARGS) -t $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):$(VERSION) -t $(DOCKER_REGISTRY)/$(DOCKER_REPO)/$(MCP_IMAGE_NAME):latest -f mcp/Dockerfile ./mcp