Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ jobs:
echo "$GHCR_PAT" | docker login ghcr.io -u "$GITHUB_ACTOR" --password-stdin

echo "=== 최신 이미지 Pull ==="
docker compose -f docker/docker-compose.prod.yml --env-file .env pull app
docker compose -f docker-compose-prod.yml --env-file .env pull app

echo "=== 앱 컨테이너 재시작 ==="
docker compose -f docker/docker-compose.prod.yml --env-file .env up -d app
docker compose -f docker-compose-prod.yml --env-file .env up -d app

echo "=== Health Check (최대 60초) ==="
for i in \$(seq 1 12); do
if curl -sf http://localhost:7300/health > /dev/null; then
if curl -sf http://localhost:7300/actuator/health > /dev/null; then
echo "Health check 통과"
exit 0
fi
Expand All @@ -65,7 +65,7 @@ jobs:
done

echo "Health check 실패"
docker compose -f docker/docker-compose.prod.yml logs --tail=50 app
docker compose -f docker-compose-prod.yml logs --tail=50 app
exit 1
ENDSSH

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}
images: ghcr.io/wisoft-prepair/backend-java
tags: |
type=raw,value=latest
type=sha,prefix=
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ services:
image: fluent/fluent-bit:3.2
container_name: interview-fluent-bit
volumes:
- ./fluentbit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf:ro
- ./fluentbit/parsers.conf:/fluent-bit/etc/parsers.conf:ro
- ./docker/fluent-bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf:ro
- ./docker/fluent-bit/parsers.conf:/fluent-bit/etc/parsers.conf:ro
ports:
- "24224:24224"
environment:
Expand Down
Loading