Enhance Docker support and update dependencies

- Updated Dockerfile to include TypeScript configuration and set up a non-root user for improved security.
- Added an entrypoint script for flexible configuration during container startup.
- Updated package.json and package-lock.json to reflect the latest versions of dependencies, including pg and vitest.
- Revised README.md to include new Docker usage instructions and prerequisites for running the server in a containerized environment.

Author: HenkDz

.dockerignore

@@ -0,0 +1,55 @@
+# Dependencies
+node_modules
+npm-debug.log*
+
+# Build outputs
+build
+dist
+
+# Development files
+*.log
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# IDE files
+.vscode
+.idea
+*.swp
+*.swo
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Git
+.git
+.gitignore
+
+# Documentation
+docs
+*.md
+!README.md
+
+# Test files
+test
+tests
+*.test.ts
+*.test.js
+*.spec.ts
+*.spec.js
+
+# Coverage
+coverage
+
+# Misc
+.eslintrc*
+.prettierrc*
+vitest.config.*
+
+# Docker
+Dockerfile*
+docker-compose*
+.dockerignore

Dockerfile

@@ -6,13 +6,30 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm ci --ignore-scripts
 
+# Copy TypeScript configuration
+COPY tsconfig.json ./
+
 # Copy all source files
 COPY . .
 
 # Build the TypeScript source
 RUN npm run build
 
+# Copy and set up entrypoint script
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
+# Create non-root user for security
+RUN addgroup -g 1001 -S nodejs
+RUN adduser -S postgres-mcp -u 1001
+
+# Change ownership of the app directory
+RUN chown -R postgres-mcp:nodejs /app
+USER postgres-mcp
+
 # Expose any necessary ports if needed (optional)
 # EXPOSE 3000
 
-CMD ["node", "build/index.js"]
+# Use entrypoint script for flexible configuration
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+CMD []

README.md

@@ -7,6 +7,11 @@ A Model Context Protocol (MCP) server that provides comprehensive PostgreSQL dat
 
 ## Quick Start
 
+## Prerequisites
+- Node.js ≥18.0.0
+- Access to a PostgreSQL server
+- (Optional) An MCP client like Cursor or Claude for AI integration
+
 [![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/install-mcp?name=postgresql-mcp&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsIkBoZW5rZXkvcG9zdGdyZXMtbWNwLXNlcnZlciIsIi0tY29ubmVjdGlvbi1zdHJpbmciLCJwb3N0Z3Jlc3FsOi8vdXNlcjpwYXNzd29yZEBob3N0OnBvcnQvZGF0YWJhc2UiXX0=)
 
 ### Option 1: npm (Recommended)
@@ -15,9 +20,16 @@ A Model Context Protocol (MCP) server that provides comprehensive PostgreSQL dat
 npm install -g @henkey/postgres-mcp-server
 
 # Or run directly with npx (no installation)
+# Use env var for connection string (optional)
+export POSTGRES_CONNECTION_STRING="postgresql://user:pass@localhost:5432/db"
+npx @henkey/postgres-mcp-server
+# Or pass directly:
 npx @henkey/postgres-mcp-server --connection-string "postgresql://user:pass@localhost:5432/db"
 ```
 
+# Verify installation
+npx @henkey/postgres-mcp-server --help
+
 Add to your MCP client configuration:
 ```json
 {
@@ -38,7 +50,40 @@ Add to your MCP client configuration:
 npx -y @smithery/cli install @HenkDz/postgresql-mcp-server --client claude
 ```
 
-### Option 3: Manual Installation (Development)
+### Option 3: Docker (Recommended for Production)
+```bash
+# Build the Docker image
+docker build -t postgres-mcp-server .
+
+# Run with environment variable
+docker run -i --rm \
+  -e POSTGRES_CONNECTION_STRING="postgresql://user:password@host:port/database" \
+  postgres-mcp-server
+```
+
+Add to your MCP client configuration:
+```json
+{
+  "mcpServers": {
+    "postgresql-mcp": {
+      "command": "docker",
+      "args": [
+        "run",
+        "-i",
+        "--rm",
+        "henkey/postgres-mcp:latest",
+        "-e",
+        "POSTGRES_CONNECTION_STRING"
+      ],
+      "env": {
+        "POSTGRES_CONNECTION_STRING": "postgresql://user:password@host:port/database"
+      }
+    }
+  }
+}
+```
+
+### Option 4: Manual Installation (Development)
 ```bash
 git clone <repository-url>
 cd postgresql-mcp-server
@@ -131,6 +176,21 @@ Add to your MCP client configuration:
   "minDuration": 100
 }
 
+// Execute a parameterized SELECT query
+{
+  "operation": "select",
+  "query": "SELECT * FROM users WHERE id = $1",
+  "parameters": [1]
+}
+
+// Perform an INSERT mutation
+{
+  "operation": "insert",
+  "table": "products",
+  "data": {"name": "New Product", "price": 99.99},
+  "returning": "id"
+}
+
 // Manage database object comments
 {
   "operation": "set",
@@ -169,9 +229,90 @@ For additional information, see the [`docs/`](./docs/) folder:
 ✅ **Security focused** - SQL injection prevention, parameterized queries  
 ✅ **Robust architecture** - Connection pooling, comprehensive error handling
 
+## Docker Usage
+
+The PostgreSQL MCP Server is fully Docker-compatible and can be used in production environments.
+
+### Building the Image
+```bash
+# Build locally
+docker build -t postgres-mcp-server .
+
+# Or pull from Docker Hub
+docker pull henkey/postgres-mcp:latest
+```
+
+### Running with Environment Variables
+```bash
+# Basic usage (using Docker Hub image)
+docker run -i --rm \
+  -e POSTGRES_CONNECTION_STRING="postgresql://user:password@host:port/database" \
+  henkey/postgres-mcp:latest
+
+# Or with locally built image
+docker run -i --rm \
+  -e POSTGRES_CONNECTION_STRING="postgresql://user:password@host:port/database" \
+  postgres-mcp-server
+
+# With tools configuration
+docker run -i --rm \
+  -e POSTGRES_CONNECTION_STRING="postgresql://user:password@host:port/database" \
+  -e POSTGRES_TOOLS_CONFIG="/app/config/tools.json" \
+  -v /path/to/config:/app/config \
+  postgres-mcp-server
+```
+
+### Docker Compose Example
+```yaml
+version: '3.8'
+services:
+  postgres-mcp:
+    build: .
+    environment:
+      - POSTGRES_CONNECTION_STRING=postgresql://user:password@postgres:5432/database
+    depends_on:
+      - postgres
+    stdin_open: true
+    tty: true
+
+  postgres:
+    image: postgres:15
+    environment:
+      - POSTGRES_DB=database
+      - POSTGRES_USER=user
+      - POSTGRES_PASSWORD=password
+    ports:
+      - "5432:5432"
+```
+
+### MCP Client Configuration
+For use with MCP clients like Cursor or Claude Desktop:
+
+```json
+{
+  "mcpServers": {
+    "postgresql-mcp": {
+      "command": "docker",
+      "args": [
+        "run",
+        "-i",
+        "--rm",
+        "henkey/postgres-mcp:latest",
+        "-e",
+        "POSTGRES_CONNECTION_STRING"
+      ],
+      "env": {
+        "POSTGRES_CONNECTION_STRING": "postgresql://user:password@host:port/database"
+      }
+    }
+  }
+}
+```
+
 ## Prerequisites
 
-- Node.js ≥ 18.0.0
+- Node.js ≥ 18.0.0 (for local development)
+- Docker (for containerized deployment)
 - PostgreSQL server access
 - Valid connection credentials
 

docker-entrypoint.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+set -e
+
+# Default values
+CONNECTION_STRING=""
+TOOLS_CONFIG=""
+
+# Parse environment variables
+if [ -n "$POSTGRES_CONNECTION_STRING" ]; then
+    CONNECTION_STRING="--connection-string $POSTGRES_CONNECTION_STRING"
+fi
+
+if [ -n "$POSTGRES_TOOLS_CONFIG" ]; then
+    TOOLS_CONFIG="--tools-config $POSTGRES_TOOLS_CONFIG"
+fi
+
+# Build the command
+CMD="node build/index.js"
+
+if [ -n "$CONNECTION_STRING" ]; then
+    CMD="$CMD $CONNECTION_STRING"
+fi
+
+if [ -n "$TOOLS_CONFIG" ]; then
+    CMD="$CMD $TOOLS_CONFIG"
+fi
+
+# Execute the command
+exec $CMD "$@"