chore: Docker 설정 간소화 및 구조 정리

Author: Woomin-Wang

.DS_Store

@@ -1,6 +1,64 @@
+# VCS
 .git
-.gradle
+.gitignore
+.gitattributes
+.github/
+
+# Gradle 로컬 캐시 / 빌드 산출물 (컨테이너 안에서 다시 생성되므로 불필요)
+.gradle/
 build/
-*.md
+out/
+bin/
+HELP.md
+
+# IDE / OS 자동 생성 파일
+.idea/
+.vscode/
+.settings/
+.classpath
+.project
+.springBeans
+.sts4-cache
+.apt_generated
+.factorypath
+*.iml
+*.iws
+*.ipr
+**/.DS_Store
+Thumbs.db
+
+# 환경변수 / 시크릿
 .env
-.idea
+.env.*
+!.env.example
+*.pem
+*.key
+id_rsa*
+
+# Docker / Compose 정의 (이미지 안에서 안 씀)
+Dockerfile
+.dockerignore
+docker/
+docker-compose*.yml
+compose*.yaml
+compose*.yml
+
+# 배포 인프라 정의 (fluent-bit 설정 등)
+deploy/
+
+# 문서
+*.md
+LICENSE
+docs/
+CLAUDE.md
+
+# 테스트 코드 (Dockerfile이 `gradlew build -x test`로 스킵하므로 제외)
+src/test/
+
+# 로컬 실행 흔적 (데이터/로그)
+postgres-data/
+logs/
+*.log
+
+# Windows 전용 스크립트 (리눅스 컨테이너 무관)
+gradlew.bat

.dockerignore

@@ -12,7 +12,7 @@ jobs:
   deploy:
     name: Deploy to Wisoft Server
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && github.event.workflow_run.head_branch == 'main'    }}
 
     steps:
       - name: SSH 키 설정
@@ -49,10 +49,10 @@ 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 pull app
 
             echo "=== 앱 컨테이너 재시작 ==="
-            docker compose -f docker/docker-compose.prod.yml --env-file .env up -d app
+            docker compose -f docker-compose.prod.yml up -d app
 
             echo "=== Health Check (최대 60초) ==="
             for i in \$(seq 1 12); do
@@ -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
 

.github/workflows/cd.yaml

@@ -5,16 +5,13 @@ FROM eclipse-temurin:21 AS builder
 
 WORKDIR /app
 
-# Gradle 캐싱을 위해 설정 파일 먼저 복사
 COPY gradlew .
 COPY gradle gradle
-COPY build.gradle .
 COPY settings.gradle .
+COPY build.gradle .
 
-# 의존성 다운로드 (캐싱 레이어)
 RUN ./gradlew dependencies --no-daemon
 
-# 소스코드 복사 후 빌드
 COPY src src
 RUN ./gradlew build -x test --no-daemon
 
@@ -29,12 +26,9 @@ RUN apt-get update && apt-get install -y ffmpeg curl && rm -rf /var/lib/apt/list
 
 COPY --from=builder /app/build/libs/*.jar app.jar
 
-# 포트 문서화
 EXPOSE 7300
 
-# 컨테이너 레벨 헬스체크 (Docker daemon의 status 표시용)
-HEALTHCHECK --interval=24h --timeout=10s --start-period=40s --retries=3 \
-  CMD curl -sf http://localhost:7300/actuator/health || exit 1
+HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+    CMD curl -sf http://localhost:7300/actuator/health
 
-# 실행
 ENTRYPOINT ["java", "-jar", "app.jar"]

Dockerfile

@@ -0,0 +1,39 @@
+services:
+  postgres:
+    image: postgres:17
+    container_name: prepair-backend-java-postgres
+    ports:
+      - "${POSTGRES_PORT}:5432"
+    environment:
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: prepair-backend-java-api
+    ports:
+      - "7300:7300"
+    env_file:
+      - .env
+    environment:
+      - SPRING_PROFILES_ACTIVE=prod
+      - TZ=Asia/Seoul
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+volumes:
+  postgres-data:
+
+
+