update docker

Author: amirasaran

.github/workflows/docker.yml

@@ -12,6 +12,7 @@ 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' }}
     steps:
       - name: Checkout
@@ -24,29 +25,40 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: watercrawl/mcp
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha,format=short
-            type=ref,event=branch
+            latest
             
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to GitHub Container Registry
+      - name: Check if Docker Hub secrets exist
+        id: check-secrets
+        run: |
+          if [ -n "${{ secrets.DOCKER_USERNAME }}" ] && [ -n "${{ secrets.DOCKER_PASSWORD }}" ]; then
+            echo "has_docker_secrets=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_docker_secrets=false" >> $GITHUB_OUTPUT
+          fi
+        
+      - name: Login to Docker Hub
         uses: docker/login-action@v2
+        # Only run this step if Docker Hub credentials are available
+        if: steps.check-secrets.outputs.has_docker_secrets == 'true'
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
           context: .
-          push: true
+          # Only push if Docker Hub credentials are available
+          push: ${{ steps.check-secrets.outputs.has_docker_secrets == 'true' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

PUBLISHING.md

@@ -29,17 +29,29 @@ To add this token to GitHub:
 5. Value: Paste your npm token
 6. Click "Add secret"
 
-### 2. `GITHUB_TOKEN`
+### 2. `DOCKER_USERNAME` and `DOCKER_PASSWORD`
+
+These secrets are used to publish Docker images to Docker Hub.
+
+To set up Docker Hub credentials:
+
+1. Create or log in to your Docker Hub account at [hub.docker.com](https://hub.docker.com/)
+2. Create an access token under Account Settings > Security
+3. Add these secrets to your GitHub repository:
+   - `DOCKER_USERNAME`: Your Docker Hub username
+   - `DOCKER_PASSWORD`: Your Docker Hub access token
+
+### 3. `GITHUB_TOKEN`
 
 This is automatically provided by GitHub Actions, so you don't need to configure it manually.
 
-## Docker Hub Configuration (Optional)
+## Docker Hub Configuration
 
-If you want to publish to Docker Hub instead of or in addition to GitHub Container Registry:
+Before your first release, make sure to:
 
-1. Create a Docker Hub access token
-2. Add `DOCKER_USERNAME` and `DOCKER_PASSWORD` secrets to GitHub
-3. Modify the docker.yml workflow to use Docker Hub
+1. Create a repository named `watercrawl/mcp` on Docker Hub
+2. Set appropriate visibility and description for your Docker image
+3. Verify that your Docker Hub user has push permissions for this repository
 
 ## Configuring npm for Scoped Package
 
@@ -71,16 +83,16 @@ Include `BREAKING CHANGE:` in the commit body or footer to trigger a major versi
 
 ## Docker Usage
 
-The Docker image is built automatically and published to GitHub Container Registry.
+The Docker image is built automatically and published to Docker Hub.
 
 To use the Docker image:
 
 ```bash
 # Pull the image
-docker pull ghcr.io/watercrawl/watercrawl-mcp:latest
+docker pull watercrawl/mcp:latest
 
 # Run the container
-docker run -p 3000:3000 -e WATERCRAWL_API_KEY=your-api-key ghcr.io/watercrawl/watercrawl-mcp:latest
+docker run -p 3000:3000 -e WATERCRAWL_API_KEY=your-api-key watercrawl/mcp:latest
 
 # Or use docker-compose
 docker-compose up

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   watercrawl-mcp:
-    image: ghcr.io/watercrawl/watercrawl-mcp:latest
+    image: watercrawl/mcp:latest
     container_name: watercrawl-mcp
     environment:
       - WATERCRAWL_API_KEY=${WATERCRAWL_API_KEY}