From 35c28e255e3059c567ccbfe76e2c577ca942c3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 14 May 2026 15:10:09 +0200 Subject: [PATCH 1/2] Update docker-compose configs --- Makefile | 6 +++--- docker-compose.yml => compose.yml | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename docker-compose.yml => compose.yml (100%) diff --git a/Makefile b/Makefile index 9d564000..ac6a3627 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ SPLUNK_HOME := /opt/splunk docker-up: # For podman (at least on macOS) you might need to add DOCKER_BUILDKIT=0 # --build forces Docker to build a new image instead of using an existing one - @docker-compose up -d --build + @docker compose up -d --build .PHONY: docker-ensure-up docker-ensure-up: @@ -97,14 +97,14 @@ docker-start: docker-up docker-ensure-up .PHONY: docker-down docker-down: - docker-compose stop + docker compose stop .PHONY: docker-restart docker-restart: docker-down docker-start .PHONY: docker-remove docker-remove: - docker-compose rm -f -s + docker compose rm -f -s .PHONY: docker-refresh docker-refresh: docker-remove docker-start diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml From ff5be77abdd48e6fda38e8ff13496b416007fa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 14 May 2026 15:25:39 +0200 Subject: [PATCH 2/2] Remove uv.lock because we don't use it, try adding .dockerignore? --- .dockerignore | 32 ++++++++++++++++++++++++++++++++ Dockerfile | 7 +++---- 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..30dafc30 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,32 @@ + +# VCS/IDE +.git +.gitignore +.github +.idea +.vscode +.claude + +# Python artifacts +.venv +.ruff_cache +.pytest_cache +.basedpyright +*.egg-info +*.pyc +__pycache__ +dist/ +build/ +.coveragerc +sitecustomize.py + +# Docs/dev-only files +docs/ +*.md +tests/ +examples/ +scripts/ +.env + +# Miscellaneous +.DS_Store diff --git a/Dockerfile b/Dockerfile index 3fd098fd..146818d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,15 @@ FROM splunk/splunk:${SPLUNK_VERSION} USER root -# Copy splunk-mcp-server.tgz, we need to copy entire sdk since +# Copy splunk-mcp-server.tgz, we need to copy entire SDK since # splunk-mcp-server.tgz might not exist and we don't want to fail in such case. RUN mkdir /tmp/sdk -COPY . /tmp/sdk -RUN /bin/bash -c 'if [ -f /tmp/sdk/splunk-mcp-server.tgz ]; then cp /tmp/sdk/splunk-mcp-server.tgz /splunk-mcp-server.tgz; fi' +COPY . /tmp/sdk # TODO: Why exactly do we need to copy the entire SDK? +RUN /bin/bash -c '[ -f /tmp/sdk/splunk-mcp-server.tgz ] && cp /tmp/sdk/splunk-mcp-server.tgz /splunk-mcp-server.tgz' RUN rm -rf /tmp/sdk RUN mkdir /tmp/sdk COPY ./pyproject.toml /tmp/sdk/pyproject.toml -COPY ./uv.lock /tmp/sdk/uv.lock COPY ./splunklib /tmp/sdk/splunklib RUN mkdir /splunklib-deps