feat: enhance Docker setup with versioning and improved build args

Author: amirasaran

.dockerignore

@@ -10,25 +10,33 @@ npm-debug.log
 yarn-debug.log
 yarn-error.log
 
-# Project specific
+# Source code (not needed since we install from npm)
 src
-tests
+bin
+dist
 scripts
+test
+tests
 *.ts
+*.js
 tsconfig.json
-.eslintrc
-.prettier*
-*.test.js
 coverage
 
-# Development environment
+# Development files
 .vscode
 .idea
 *.swp
 *.swo
 .DS_Store
+.eslintrc*
+.prettier*
 
-# Environment
+# Environment files
 .env
 .env.*
 !.env.example
+
+# Documentation and config
+README.md
+PUBLISHING.md
+*.md

.github/workflows/docker.yml

@@ -7,31 +7,48 @@ on:
     workflows: ["Release"]
     branches: [main]
     types: [completed]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to build and push (e.g., 1.0.1)'
+        required: true
+        type: string
 
 jobs:
   docker:
     name: Build & Push Docker Image
     runs-on: ubuntu-latest
-    # Only run if the release workflow completed successfully or a release was published
-    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'release' }}
+    # Only run if the release workflow completed successfully, a release was published, or manually triggered
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: main
           fetch-depth: 0
+      
+      - name: Get package version
+        id: package-version
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            VERSION="${{ github.event.inputs.version }}"
+            echo "Using manual version: $VERSION"
+          else
+            VERSION=$(node -p "require('./package.json').version")
+            echo "Using package.json version: $VERSION"
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
         
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: watercrawl/mcp
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=raw,value=v${{ steps.package-version.outputs.version }}
+            type=raw,value=latest
             type=sha,format=short
-            latest
+            type=raw,value={{branch}}-{{sha}}
             
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -63,3 +80,5 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            VERSION=${{ steps.package-version.outputs.version }}

Dockerfile

@@ -6,8 +6,18 @@ ENV NODE_ENV=production \
     SSE_PORT=3000 \
     SSE_ENDPOINT=/sse
 
-# Install the published package globally
-RUN npm install -g @watercrawl/mcp
+# Accept version as build argument
+ARG VERSION
+ENV VERSION=${VERSION}
+
+# Install the specific version of the published package globally
+RUN npm install -g @watercrawl/mcp@${VERSION}
+
+# Create a non-root user
+RUN addgroup -g 1001 -S watercrawl && \
+    adduser -S watercrawl -u 1001
+
+USER watercrawl
 
 # Expose port for SSE server
 EXPOSE 3000