Merge pull request #255 from dgageot/build-host-binary-in-docker

Compile the host-binary in docker

Author: trungutt

.github/workflows/extension.yml

@@ -12,11 +12,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Build Host Binary
-        run: |
-          cd src/extension
-          make cross
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -37,3 +32,6 @@ jobs:
           tags: docker/labs-ai-tools-for-devs:${{ github.event.release.tag_name }}
           file: src/extension/Dockerfile
           context: src/extension
+          build-contexts: |
+            prompts=../../prompts
+          

src/extension/.dockerignore

@@ -1,2 +1,5 @@
 ui/node_modules
-dist/install/_internal
+dist/install/_internal
+/**/dist/*
+/**/bin/host-binary
+/**/Makefile

src/extension/Dockerfile

@@ -2,14 +2,23 @@
 
 FROM alpine:3.21@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c AS alpine
 
+FROM --platform=$BUILDPLATFORM golang:1.24.2-alpine3.21@sha256:7772cb5322baa875edd74705556d08f0eeca7b9c4b5367754ce3f2f00041ccee AS go-builder
+WORKDIR /app
+COPY host-binary ./
+RUN --mount=type=cache,target=/root/.cache/go-build <<EOT
+    GOOS=linux   CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /dist/linux/host-binary ./cmd
+    GOOS=darwin  CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /dist/darwin/host-binary ./cmd
+    GOOS=windows CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /dist/windows/host-binary.exe ./cmd
+EOT
+
 FROM --platform=$BUILDPLATFORM node:23-alpine3.21@sha256:86703151a18fcd06258e013073508c4afea8e19cd7ed451554221dd00aea83fc AS client-builder
 WORKDIR /ui
 COPY ui/package.json ui/package-lock.json ./
 RUN --mount=type=cache,target=/root/.npm npm ci
 COPY ui/. .
 RUN --mount=type=cache,target=/root/.npm npm run build
 
-FROM alpine AS pull-catalog-images
+FROM --platform=$BUILDPLATFORM alpine AS pull-catalog-images
 RUN apk add --no-cache curl yq
 COPY --from=prompts catalog.yaml /
 RUN <<EOT
@@ -38,8 +47,8 @@ LABEL org.opencontainers.image.title="Docker MCP Toolkit" \
     com.docker.extension.changelog="Added MCP catalog"
 
 COPY docker-compose.yaml metadata.json extension-icon.svg /
-COPY host-binary/dist/windows-${TARGETARCH}/host-binary.exe /windows/host-binary.exe
-COPY host-binary/dist/darwin-${TARGETARCH}/host-binary /darwin/host-binary
-COPY host-binary/dist/linux-${TARGETARCH}/host-binary /linux/host-binary
+COPY --from=go-builder /dist/linux/host-binary /linux/host-binary
+COPY --from=go-builder /dist/darwin/host-binary /darwin/host-binary
+COPY --from=go-builder /dist/windows/host-binary.exe /windows/host-binary.exe
 COPY --from=pull-catalog-images /icons ui/static-assets
 COPY --from=client-builder /ui/build ui

src/extension/Makefile

@@ -13,7 +13,7 @@ bin:
 cross:
 	cd host-binary && $(MAKE) cross
 
-build-extension: cross ## Build service image to be deployed as a desktop extension
+build-extension: ## Build service image to be deployed as a desktop extension
 	docker buildx build --build-context prompts=../../prompts --load --tag=$(IMAGE):$(TAG) .
 
 install-extension: build-extension ## Install the extension
@@ -25,7 +25,7 @@ update-extension: build-extension ## Update the extension
 prepare-buildx: ## Create buildx builder for multi-arch build, if not exists
 	docker buildx inspect $(BUILDER) || docker buildx create --name=$(BUILDER) --driver=docker-container --driver-opt=network=host
 
-push-extension: prepare-buildx cross ## Build & Upload extension image to hub. Do not push if tag already exists: make push-extension tag=0.1
+push-extension: prepare-buildx ## Build & Upload extension image to hub. Do not push if tag already exists: make push-extension tag=0.1
 	docker pull $(IMAGE):$(TAG) && echo "Failure: Tag already exists" || docker buildx build --build-context prompts=../../prompts --push --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --build-arg TAG=$(TAG) --tag=$(IMAGE):$(TAG) .
 
 help: ## Show this help