Skip to content

포트 충돌 해결 및 환경변수 정상 주입되도록 수정 #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dongkyun0713 merged 2 commits into from
Dec 21, 2025
Merged

포트 충돌 해결 및 환경변수 정상 주입되도록 수정 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e796221
refactor(#159): 포트 충돌 해결
dongkyun0713 Dec 21, 2025
4024289
refactor(#159): 환경변수 정상 주입되도록 수정
dongkyun0713 Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .github/workflows/deploy-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
-Duser.timezone=Asia/Seoul

ports:
- "127.0.0.1:8080:8080" # 내부 접근만 허용
- "8080:8080"
depends_on:
redis:
condition: service_healthy
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading