fix: ci-cd for staging (#1)

* Delete test-mcp.js

* fix: ci-cd for staging

* Use docker-compose.yml in staging workflow

Replace references to docker-compose.staging.yml with docker-compose.yml in .github/workflows/docker-build-staging.yml. This ensures the staging CI uses the generic compose file for both the docker-compose and docker compose command paths, simplifying configuration and avoiding filename mismatches.

* Update docker-build-staging.yml

* upd

* upd

Author: dadadadas111

.github/workflows/docker-build-staging.yml

@@ -67,38 +67,48 @@ jobs:
 
       - name: Deploy to VPS via SSH
         uses: appleboy/ssh-action@v1.0.0
+        env:
+          REGISTRY: ${{ env.REGISTRY }}
+          IMAGE_NAME: ${{ env.IMAGE_NAME }}
+          GITHUB_SHA: ${{ github.sha }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_ACTOR: ${{ github.actor }}
         with:
           host: ${{ secrets.VPS_HOST }}
           username: ${{ secrets.VPS_USERNAME }}
           password: ${{ secrets.VPS_PASSWORD }}
           port: ${{ secrets.VPS_PORT }}
+          envs: REGISTRY,IMAGE_NAME,GITHUB_SHA,GITHUB_TOKEN,GITHUB_ACTOR
           script: |
             set -e
 
             # Navigate to staging project directory
             cd /opt/mcp-stag
 
+            # Remove any GitHub workflow files that might interfere
+            sudo rm -rf .github/ || true
+
             # Login to GitHub Container Registry
-            echo ${{ secrets.GITHUB_TOKEN }} | sudo docker login ghcr.io -u ${{ github.actor }} --password-stdin
+            echo ${GITHUB_TOKEN} | sudo docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin
+
+            # Get short SHA (first 7 characters)
+            SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
 
             # Pull the staging image
-            sudo docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:staging-${{ github.sha }}
+            sudo docker pull ${REGISTRY}/${IMAGE_NAME}:staging-${SHORT_SHA}
 
             # Detect docker-compose version and use appropriate command
             if command -v docker-compose &> /dev/null; then
-                COMPOSE_CMD="sudo docker-compose -f docker-compose.staging.yml"
+                COMPOSE_CMD="docker-compose -f docker-compose.staging.yml"
             else
-                COMPOSE_CMD="sudo docker compose -f docker-compose.staging.yml"
+                COMPOSE_CMD="docker compose -f docker-compose.staging.yml"
             fi
 
             # Stop and remove old containers
-            $COMPOSE_CMD down || true
-
-            # Set image tag for staging deployment
-            export IMAGE_TAG=staging-${{ github.sha }}
+            sudo $COMPOSE_CMD down || true
 
-            # Start services with the new staging image
-            $COMPOSE_CMD up -d
+            # Start services with the new staging image (pass IMAGE_TAG inline)
+            sudo IMAGE_TAG=staging-${SHORT_SHA} $COMPOSE_CMD up -d
 
             # Wait for services to be healthy
             echo "Waiting for staging services to start..."

docker-compose.staging.yml

@@ -1,8 +1,7 @@
-version: '3.8'
 
 services:
   iot-cloud-mcp-staging:
-    image: ghcr.io/dadadadas111/iot-cloud-mcp:${IMAGE_TAG:-staging-latest}
+    image: ghcr.io/dadadadas111/iot-cloud-mcp:${IMAGE_TAG}
     container_name: iot-cloud-mcp-staging
     restart: unless-stopped
     ports:

package-lock.json

@@ -8,6 +8,6 @@ import { RedisService } from '@/mcp/services/redis.service';
 @Module({
   imports: [HttpModule, AuthModule],
   providers: [McpService, ApiClientService, RedisService],
-  exports: [McpService],
+  exports: [McpService, ApiClientService],
 })
 export class McpModule {}