From c6e91ff896378bfd5d63a6df0ebe1e7280f3bc32 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 12:54:01 +0200 Subject: [PATCH 01/11] Add Dockerfile --- Dockerfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..61eb293 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +# Stage 1: Cache Gradle dependencies +FROM gradle:latest AS cache +RUN mkdir -p /home/gradle/cache_home +ENV GRADLE_USER_HOME=/home/gradle/cache_home +COPY build.gradle.* gradle.properties /home/gradle/app/ +COPY gradle /home/gradle/app/gradle +WORKDIR /home/gradle/app +RUN gradle dependencies --no-daemon + +# Stage 2: Build Application +FROM gradle:latest AS build +COPY --from=cache /home/gradle/cache_home /home/gradle/.gradle +COPY --chown=gradle:gradle . /home/gradle/src +WORKDIR /home/gradle/src +# Build the fat JAR, Gradle also supports shadow +# and boot JAR by default. +RUN gradle fatJar --no-daemon + +# Stage 3: Create the Runtime Image +FROM amazoncorretto:22 AS runtime +EXPOSE 3000 +RUN mkdir /app +COPY --from=build /home/gradle/src/server/build/libs/*.jar /app/server.jar +ENTRYPOINT ["java","-jar","/app/server.jar"] From 3e6e147aa990fa8d853a01de0aa861b67bd0b5c4 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:15:04 +0200 Subject: [PATCH 02/11] Set workdir --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 61eb293..0281732 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,5 +20,6 @@ RUN gradle fatJar --no-daemon FROM amazoncorretto:22 AS runtime EXPOSE 3000 RUN mkdir /app +WORKDIR /app COPY --from=build /home/gradle/src/server/build/libs/*.jar /app/server.jar ENTRYPOINT ["java","-jar","/app/server.jar"] From 2953df289a39ff72c3f52e93efbc975d3cd5ddcd Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:21:37 +0200 Subject: [PATCH 03/11] Add docker build workflow --- .github/workflows/docker.yml | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..afb5fa7 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,66 @@ +name: Build and Publish Multi-Arch Image + +on: + push: + branches: [ "main" ] + tags: [ 'v*.*.*' ] + pull_request: + branches: [ "main" ] + +env: + REGISTRY: ghcr.io + # github.repository as / + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Set up QEMU for multi-platform support (required for arm64) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + # Set up Docker Buildx + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + # Login against a Docker registry (except on PR) + - name: Log into registry ${{ env.REGISTRY }} + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Extract metadata (tags, labels) for Docker + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=ref,event=branch + type=semver,pattern={{version}} + type=sha + + # Build and push Docker image with Buildx + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + # Define the platforms for multi-arch + platforms: linux/amd64,linux/arm64 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + # Use GitHub cache to speed up subsequent builds + cache-from: type=gha + cache-to: type=gha,mode=max From 08d11e0a398fe1b72d52874023ff8d2685e4fc54 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:28:40 +0200 Subject: [PATCH 04/11] Update image version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0281732..a63d83b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ WORKDIR /home/gradle/src RUN gradle fatJar --no-daemon # Stage 3: Create the Runtime Image -FROM amazoncorretto:22 AS runtime +FROM amazoncorretto:21-alpine AS runtime EXPOSE 3000 RUN mkdir /app WORKDIR /app From 5ceec3dc6a7d344e2960565b05f96beca34e6611 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:29:28 +0200 Subject: [PATCH 05/11] Add instructions --- DOCKER.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 DOCKER.md diff --git a/DOCKER.md b/DOCKER.md new file mode 100644 index 0000000..f11c800 --- /dev/null +++ b/DOCKER.md @@ -0,0 +1,21 @@ +# Docker + +1. Build the docker image: + ```shell + docker build -t davx5-mcp . + ``` +2. Start the container: + ```shell + docker run -p 3000 -v davx5-mcp-data:/app/data davx5-mcp + ``` + +# Docker Compose + +1. Build the docker image: + ```shell + docker compose build + ``` +2. Start the container: + ```shell + docker compose up + ``` From de18957ca28e4dce6dc704c182432a18c799d6a6 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:29:33 +0200 Subject: [PATCH 06/11] Add compose file --- compose.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 compose.yml diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000..ad507d3 --- /dev/null +++ b/compose.yml @@ -0,0 +1,11 @@ +services: + davx5-mcp: + build: . + ports: + - 3000:3000 + volumes: + - data:/app/data + +volumes: + data: + name: davx5-mcp-data From cfada2f13b83d24c01a24ce1249a2232b4864bb6 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:31:47 +0200 Subject: [PATCH 07/11] Attach to `0.0.0.0` instead of localhost --- server/src/main/kotlin/at/bitfire/labs/davmcp/McpServer.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/kotlin/at/bitfire/labs/davmcp/McpServer.kt b/server/src/main/kotlin/at/bitfire/labs/davmcp/McpServer.kt index f1abd03..cb0f0db 100644 --- a/server/src/main/kotlin/at/bitfire/labs/davmcp/McpServer.kt +++ b/server/src/main/kotlin/at/bitfire/labs/davmcp/McpServer.kt @@ -33,7 +33,7 @@ class McpServer @Inject constructor( fun start(port: Int) { println("Running MCP server") - embeddedServer(CIO, host = "127.0.0.1", port = port) { + embeddedServer(CIO, host = "0.0.0.0", port = port) { install(SSE) install(ContentNegotiation) { json(McpJson) From 02f33e8ecb18076da1cf7e9576a233c7e3cd6d18 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Thu, 2 Apr 2026 13:37:52 +0200 Subject: [PATCH 08/11] Provide volume as mounted by default --- compose.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compose.yml b/compose.yml index ad507d3..56b86aa 100644 --- a/compose.yml +++ b/compose.yml @@ -4,8 +4,4 @@ services: ports: - 3000:3000 volumes: - - data:/app/data - -volumes: - data: - name: davx5-mcp-data + - ./data:/app/data From 83c95a2e5daabda7fc8ce4d7380455ed51e7fbbf Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 3 Apr 2026 11:27:50 +0200 Subject: [PATCH 09/11] Update Docker build workflow to use manual dispatch with ref input - Replace push/pull_request triggers with workflow_dispatch - Add ref input parameter for branch/tag/SHA selection - Update checkout step to use specified ref --- .github/workflows/docker.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index afb5fa7..4f9757f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,11 +1,13 @@ name: Build and Publish Multi-Arch Image on: - push: - branches: [ "main" ] - tags: [ 'v*.*.*' ] - pull_request: - branches: [ "main" ] + workflow_dispatch: + inputs: + ref: + description: 'Branch, tag, or commit SHA to build' + required: true + default: 'main' + type: string env: REGISTRY: ghcr.io @@ -22,6 +24,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + ref: ${{ github.event.inputs.ref }} # Set up QEMU for multi-platform support (required for arm64) - name: Set up QEMU From 3151bee4a2fa94672b23c08720a6fcc7e1031cfd Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 3 Apr 2026 11:30:12 +0200 Subject: [PATCH 10/11] Move Docker files to dedicated directory - Relocate `compose.yml` and `Dockerfile` to `docker/` subdirectory - Update GitHub Actions workflow to use new Docker context - Adjust `DOCKER.md` instructions to reference new paths --- .github/workflows/docker.yml | 2 +- DOCKER.md | 6 +++--- Dockerfile => docker/Dockerfile | 0 compose.yml => docker/compose.yml | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) rename Dockerfile => docker/Dockerfile (100%) rename compose.yml => docker/compose.yml (58%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4f9757f..0f7f8af 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -59,7 +59,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v6 with: - context: . + context: docker push: ${{ github.event_name != 'pull_request' }} # Define the platforms for multi-arch platforms: linux/amd64,linux/arm64 diff --git a/DOCKER.md b/DOCKER.md index f11c800..8732e24 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -2,7 +2,7 @@ 1. Build the docker image: ```shell - docker build -t davx5-mcp . + docker build -t davx5-mcp -f docker/Dockerfile . ``` 2. Start the container: ```shell @@ -13,9 +13,9 @@ 1. Build the docker image: ```shell - docker compose build + docker compose -f docker/compose.yml build ``` 2. Start the container: ```shell - docker compose up + docker compose -f docker/compose.yml up ``` diff --git a/Dockerfile b/docker/Dockerfile similarity index 100% rename from Dockerfile rename to docker/Dockerfile diff --git a/compose.yml b/docker/compose.yml similarity index 58% rename from compose.yml rename to docker/compose.yml index 56b86aa..7d32c4d 100644 --- a/compose.yml +++ b/docker/compose.yml @@ -1,6 +1,8 @@ services: davx5-mcp: - build: . + build: + context: .. + dockerfile: docker/Dockerfile ports: - 3000:3000 volumes: From 4d1413a3d8010e8875d97db3a5d1d6c5cd960734 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 3 Apr 2026 11:34:36 +0200 Subject: [PATCH 11/11] Fix bug in docker.yml --- .github/workflows/docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0f7f8af..9b3724e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -59,7 +59,8 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v6 with: - context: docker + context: . + file: docker/Dockerfile push: ${{ github.event_name != 'pull_request' }} # Define the platforms for multi-arch platforms: linux/amd64,linux/arm64