diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index bb4483dd..facbdd1c 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -79,7 +79,7 @@ jobs: source: "docker/production/promtail-config.yml" target: "~/app" - - name: Copy promtail-config to EC2 + - name: Copy agent-config to EC2 uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.SERVER_HOST }} @@ -89,6 +89,26 @@ jobs: target: "~/app" overwrite: true + - name: Copy application-production.yml to EC2 + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.SERVER_HOST }} + username: ubuntu + key: ${{ secrets.SERVER_SSH_KEY }} + source: "apps/user-service/src/main/resources/application-production.yml" + target: "~/app/docker/production/config/application-production.yml" + overwrite: true + + - name: Copy log4j2-production.yml to EC2 + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.SERVER_HOST }} + username: ubuntu + key: ${{ secrets.SERVER_SSH_KEY }} + source: "apps/user-service/src/main/resources/log4j2-production.yml" + target: "~/app/docker/production/config/log4j2-production.yml" + overwrite: true + - name: Deploy on EC2 uses: appleboy/ssh-action@v1.0.3 with: diff --git a/apps/user-service/build.gradle b/apps/user-service/build.gradle index 16905e8e..3660ab02 100644 --- a/apps/user-service/build.gradle +++ b/apps/user-service/build.gradle @@ -160,6 +160,13 @@ bootJar { from ("${asciidoctor.outputDir}/html5") { into 'static/docs' } + + // 프로덕션 JAR에서 불필요한 파일들 제외 + exclude 'application-test-*.yml' + exclude 'log4j2-test-*.yml' + exclude 'application-develop.yml' + exclude 'log4j2-develop.yml' + exclude 'sql/**' } spotless { diff --git a/apps/user-service/src/main/resources/log4j2-production.yml b/apps/user-service/src/main/resources/log4j2-production.yml index ae8e9aba..79d920fc 100644 --- a/apps/user-service/src/main/resources/log4j2-production.yml +++ b/apps/user-service/src/main/resources/log4j2-production.yml @@ -1,6 +1,7 @@ Configuration: status: INFO name: production + monitorInterval: 30 properties: property: diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml index 6d9a3c10..35ecb706 100644 --- a/docker/production/docker-compose.yml +++ b/docker/production/docker-compose.yml @@ -32,6 +32,7 @@ services: - SPRING_PROFILES_ACTIVE=production volumes: - logs_volume:/logs + - ./config:/app/config:ro # Grafana Agent만으로 메트릭 수집 + 전송 grafana-agent: