diff --git a/platform/Dockerfile b/platform/Dockerfile index aac383e..5a2ec63 100644 --- a/platform/Dockerfile +++ b/platform/Dockerfile @@ -14,6 +14,5 @@ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt flask psutil COPY . . - -EXPOSE 5000 +EXPOSE 8000 CMD ["python", "app.py"] \ No newline at end of file diff --git a/platform/Jenkinsfile b/platform/Jenkinsfile index d8f6e27..38bfef7 100644 --- a/platform/Jenkinsfile +++ b/platform/Jenkinsfile @@ -21,6 +21,10 @@ pipeline { stage('Deploy to Server 1') { steps { sh ''' + mkdir -p /root/management-platform/modules + cp -f ./platform/modules/*.py /root/management-platform/modules/ + echo "✅ Synced platform/modules → /root/management-platform/modules" + docker stop management-platform 2>/dev/null || true docker rm management-platform 2>/dev/null || true @@ -34,6 +38,7 @@ pipeline { -v /etc/passwd:/etc/passwd:ro \ -v /etc/shadow:/etc/shadow:ro \ -v /root/management-platform/config.py:/app/config.py:ro \ + -v /root/management-platform/modules:/app/modules:ro \ management-platform:latest sleep 5 @@ -42,7 +47,7 @@ pipeline { echo "✅ Deployed successfully" else echo "❌ Container failed to start" - docker logs management-platform --tail=30 + docker logs management-platform --tail=20 exit 1 fi ''' @@ -53,10 +58,11 @@ pipeline { steps { sh ''' sleep 3 - if curl -sf http://localhost:8088/login 2>/dev/null; then - echo "✅ Platform responding on :8088" + STATUS=$(curl -s -o /dev/null -w "%{http_code}" -L http://localhost:8088/) + if [ "$STATUS" = "200" ] || [ "$STATUS" = "302" ]; then + echo "✅ Platform responding on :8088 (HTTP $STATUS)" else - echo "❌ Health check failed — container logs:" + echo "❌ Health check failed — got HTTP $STATUS" docker logs management-platform --tail=40 2>/dev/null || true exit 1 fi