diff --git a/Jenkinsfile b/Jenkinsfile index 285ea74..a0d89e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,10 +2,8 @@ pipeline { agent any environment { - COMPOSE_PROJECT = 'autostock' - DEPLOY_DIR = '/volume1/docker/autostock' - COMPOSE_FILE = 'docker-compose.yml' - ENV_FILE = "${DEPLOY_DIR}/.env" + DEPLOY_DIR = '/volume1/docker/autostock' + ENV_FILE = "${DEPLOY_DIR}/.env" } options { @@ -46,21 +44,28 @@ print('All files OK') } } - stage('Test') { - steps { - sh ''' - cd backend - pip install -r requirements.txt -q 2>/dev/null || true - python -m pytest tests/ -x -q --tb=short 2>&1 || true - ''' - } - } - - stage('Build Images') { + stage('Sync & Build') { steps { sh """ + echo "=== Syncing source to deploy directory ===" + mkdir -p ${DEPLOY_DIR} + + # .env 존재 확인 + if [ ! -f "${ENV_FILE}" ]; then + echo "WARNING: ${ENV_FILE} not found. Creating template..." + cp deploy/setup-nas.sh ${DEPLOY_DIR}/ 2>/dev/null || true + fi + + # 소스 동기화 (backend, mcp-server, frontend, docker-compose.yml, docker/) + cp docker-compose.yml ${DEPLOY_DIR}/ + cp -r docker/ ${DEPLOY_DIR}/ 2>/dev/null || true + rsync -a --delete backend/ ${DEPLOY_DIR}/backend/ || cp -r backend/ ${DEPLOY_DIR}/backend/ + rsync -a --delete mcp-server/ ${DEPLOY_DIR}/mcp-server/ || cp -r mcp-server/ ${DEPLOY_DIR}/mcp-server/ + rsync -a --delete frontend/ ${DEPLOY_DIR}/frontend/ || cp -r frontend/ ${DEPLOY_DIR}/frontend/ + echo "=== Building Docker Images ===" - docker compose -f ${COMPOSE_FILE} build --no-cache backend mcp-server frontend + cd ${DEPLOY_DIR} + docker-compose build --no-cache backend mcp-server frontend """ } } @@ -68,41 +73,25 @@ print('All files OK') stage('Deploy') { steps { sh """ - echo "=== Syncing to deploy directory ===" - mkdir -p ${DEPLOY_DIR} - - # .env는 배포 디렉토리에서 관리 (Git에 없음) - if [ ! -f "${ENV_FILE}" ]; then - echo "ERROR: ${ENV_FILE} not found. Copy .env.example and configure." - exit 1 - fi - - # docker-compose.yml 복사 - cp ${COMPOSE_FILE} ${DEPLOY_DIR}/ - cp -r docker/ ${DEPLOY_DIR}/ 2>/dev/null || true - - echo "=== Rolling Deploy ===" cd ${DEPLOY_DIR} - # 1. DB/Redis/RabbitMQ는 유지 (데이터 보존) - # 2. 앱 컨테이너만 재시작 - docker compose --env-file .env stop backend mcp-server frontend - docker compose --env-file .env up -d backend mcp-server frontend + echo "=== Rolling Deploy (앱만 재시작, DB/Redis 유지) ===" + docker-compose stop backend mcp-server frontend 2>/dev/null || true + docker-compose up -d echo "=== Waiting for health check ===" - sleep 10 + sleep 15 - # Backend health check for i in 1 2 3 4 5; do if curl -sf http://localhost:8000/health > /dev/null 2>&1; then - echo "Backend is healthy" + echo "Backend is healthy!" break fi echo "Waiting for backend... (\$i/5)" sleep 5 done - docker compose ps + docker-compose ps """ } } @@ -111,7 +100,7 @@ print('All files OK') steps { sh """ cd ${DEPLOY_DIR} - docker compose exec -T backend alembic upgrade head 2>/dev/null || echo "Migration skipped (no pending)" + docker-compose exec -T backend alembic upgrade head 2>/dev/null || echo "Migration skipped (no pending)" """ } } @@ -124,7 +113,7 @@ print('All files OK') failure { echo 'Deployment failed!' sh """ - cd ${DEPLOY_DIR} 2>/dev/null && docker compose logs --tail=50 backend mcp-server 2>/dev/null || true + cd ${DEPLOY_DIR} 2>/dev/null && docker-compose logs --tail=30 backend mcp-server 2>/dev/null || true """ } always {