diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 6828354..22f8396 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -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 @@ -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 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1d89e85..db0dbe2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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= diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index c7a5bdc..8215e15 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -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: