conflicts fixed

Author: rahuldotar

.github/PULL_REQUEST_TEMPLATE/plugin.md

@@ -0,0 +1,21 @@
+# 🧱 New Plugin
+
+## 🔗 Closes
+_Link to the epic or parent issue:_
+
+Closes #
+
+
+## 🚀 Summary
+_Describe the new plugin_
+
+
+## 🧪 Checks
+
+- [ ] Plugin was [bootstrapped with the CLI](https://ibm.github.io/mcp-context-forge/using/plugins/lifecycle/) (native or external template)
+- [ ] Unit tests created for the new plugin
+- [ ] `make lint plugins` passes
+- [ ] `make test` passes
+- [ ] CHANGELOG updated (if user-facing)
+- [ ] README documentation was created for the plugin
+- [ ] New plugin added to the [documentation](https://ibm.github.io/mcp-context-forge/using/plugins/plugins/) linking to the README above

.github/pull_request_template.md

@@ -1,10 +1,11 @@
 # 📝 Pull Request Template Selection
 
-Thank you for contributing! To help us review your pull request effectively, please select the appropriate template:
+Thank you for contributing! To help us review your pull request effectively, please select the appropriate template (go to the `Preview` tab and select the appropriate sub-template):
 
 - **Bug Fix**: [Use the Bug Fix Template](?template=bug_fix.md)
 - **Feature / Enhancement**: [Use the Feature Template](?template=feature.md)
 - **Documentation Update**: [Use the Docs Template](?template=docs.md)
+- **Plugin**: [Use the Plugin Template](?template=plugin.md)
 
 Alternatively, after opening your pull request, you can choose the appropriate template from the **"Choose a template"** dropdown menu located at the top-right of the description box.
 

Makefile

@@ -2756,8 +2756,13 @@ endif
 # Alternative: Always default to docker compose unless explicitly overridden
 # COMPOSE_CMD ?= docker compose
 
+# Profile detection (for platform-specific services)
+ifeq ($(PLATFORM),linux/amd64)
+    PROFILE = --profile with-fast-time 
+endif
+
 define COMPOSE
-$(COMPOSE_CMD) -f $(COMPOSE_FILE)
+$(COMPOSE_CMD) -f $(COMPOSE_FILE) $(PROFILE) 
 endef
 
 .PHONY: compose-up compose-restart compose-build compose-pull \

docker-compose.yml

@@ -159,7 +159,7 @@ services:
       - POSTGRES_PASSWORD=mysecretpassword
       - POSTGRES_DB=mcp
     volumes:
-      - pgdata:/var/lib/postgresql/data
+      - pgdata:/var/lib/postgresql  # Postgres 18+ uses /var/lib/postgresql (not /data subdirectory)
     networks: [mcpnet]
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
@@ -383,6 +383,9 @@ services:
 
   ###############################################################################
   # Fast Time Server - High-performance time/timezone service for MCP
+  # Note: This is an amd64-only image. On ARM platforms (Apple Silicon),
+  # emulation may not work properly. Use profiles to disable:
+  # docker compose --profile with-fast-time up -d
   ###############################################################################
   fast_time_server:
     image: ghcr.io/ibm/fast-time-server:latest
@@ -391,6 +394,7 @@ services:
     ports:
       - "8778:8080"    # Map host port 8888 to container port 8080
     command: ["-transport=sse", "-listen=0.0.0.0", "-port=8080", "-log-level=info"]
+    profiles: ["with-fast-time"]  # Optional: enable with --profile with-fast-time
 
   ###############################################################################
   # Auto-registration service - registers fast_time_server with gateway
@@ -407,6 +411,7 @@ services:
       - JWT_SECRET_KEY=my-test-key
     # This is a one-shot container that exits after registration
     restart: "no"
+    profiles: ["with-fast-time"]  # Optional: enable with --profile with-fast-time
     entrypoint: ["/bin/sh", "-c"]
     command:
       - |