diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 546f663..33c51bb 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -91,19 +91,19 @@ jobs: cd /home/ec2-user/widyu - export DOCKER_IMAGE_NAME="${{ env.DOCKER_IMAGE_NAME }}" - export IMAGE_TAG="${{ github.sha }}" + # .env 파일 복사 및 Docker 이미지 정보 추가 + cp /home/ec2-user/.env .env + echo "DOCKER_IMAGE_NAME=${{ env.DOCKER_IMAGE_NAME }}" >> .env + echo "IMAGE_TAG=${{ github.sha }}" >> .env echo "🐳 Pulling Docker image..." - docker pull ${DOCKER_IMAGE_NAME}:${IMAGE_TAG} + docker pull ${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }} echo "🛑 Stopping existing containers..." - docker compose -f docker-compose.yml -f docker-compose.dev.yml \ - --env-file /home/ec2-user/.env down || true + docker compose -f docker-compose.yml -f docker-compose.dev.yml down || true echo "🚀 Starting new containers..." - docker compose -f docker-compose.yml -f docker-compose.dev.yml \ - --env-file /home/ec2-user/.env up -d + docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d echo "⏳ Waiting for health check..." sleep 15 @@ -120,6 +120,5 @@ jobs: done echo "⚠️ Health check timeout. Checking logs..." - docker compose -f docker-compose.yml -f docker-compose.dev.yml \ - --env-file /home/ec2-user/.env logs --tail=50 widyu-api + docker compose -f docker-compose.yml -f docker-compose.dev.yml logs --tail=50 widyu-api exit 1 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index c588e07..e2679e2 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -28,7 +28,7 @@ services: -Duser.timezone=Asia/Seoul ports: - - "127.0.0.1:8080:8080" # 내부 접근만 허용 + - "8080:8080" depends_on: redis: condition: service_healthy diff --git a/docker-compose.yml b/docker-compose.yml index 59c507b..79aa672 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,8 +73,6 @@ services: SWAGGER_VERSION: ${SWAGGER_VERSION:-1.0.0} SWAGGER_URL: ${SWAGGER_URL:-http://localhost} - ports: - - "127.0.0.1:8080:8080" volumes: - app_logs:/app/logs networks: