diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index de5005a8..b844d141 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -33,7 +33,7 @@ jobs: run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build --no-daemon + run: ./gradlew :photi-apis:enduser:bootJar --no-daemon - name: Login to Docker Hub uses: docker/login-action@v3 diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index e68d2b44..8345e5f4 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,3 +1,3 @@ FROM eclipse-temurin:17-jdk -COPY build/libs/*.jar app.jar +COPY photi-apis/enduser/build/libs/*.jar app.jar ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] \ No newline at end of file diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c396e91e..8fdbb7fa 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -1,6 +1,6 @@ services: backend: - image: yugyeong390/photi-server:1.1.4 + image: yugyeong390/photi-server:1.2.0 env_file: - .env ports: @@ -10,6 +10,7 @@ services: environment: - TZ=Asia/Seoul - LOGGING_FILE_PATH=/logs + restart: always networks: - server-network redis: diff --git a/photi-apis/enduser/src/main/resources/application.yml b/photi-apis/enduser/src/main/resources/application.yml index fbf87e31..6efc0856 100644 --- a/photi-apis/enduser/src/main/resources/application.yml +++ b/photi-apis/enduser/src/main/resources/application.yml @@ -52,7 +52,7 @@ springdoc: swagger-ui: enabled: false -management: # TODO 수정 필요 +management: endpoints: enabled-by-default: false jmx: diff --git a/photi-core/domain/src/main/resources/application-domain.yml b/photi-core/domain/src/main/resources/application-domain.yml index 8f29cae6..375c8024 100644 --- a/photi-core/domain/src/main/resources/application-domain.yml +++ b/photi-core/domain/src/main/resources/application-domain.yml @@ -63,6 +63,12 @@ spring: url: ${RDS_URL} username: ${RDS_USERNAME} password: ${RDS_PASSWORD} + hikari: + maximum-pool-size: 10 + minimum-idle: 10 + connection-timeout: 30000 + max-lifetime: 297000 + keepalive-time: 200000 jpa: hibernate: ddl-auto: validate diff --git a/photi-core/infra/src/main/resources/application-infra.yml b/photi-core/infra/src/main/resources/application-infra.yml index d38bb7c1..369255db 100644 --- a/photi-core/infra/src/main/resources/application-infra.yml +++ b/photi-core/infra/src/main/resources/application-infra.yml @@ -83,3 +83,16 @@ cloud: bucket: ${AWS_BUCKET} stack: auto: false + +oauth: + kakao: + base-url: ${KAKAO_BASE_URL} + rest-api-key: ${KAKAO_REST_API_KEY} + google: + base-url: ${GOOGLE_BASE_URL} + rest-api-key: ${GOOGLE_REST_API_KEY} + apple: + base-url: ${APPLE_BASE_URL} + rest-api-key: ${APPLE_REST_API_KEY} + client-id: ${APPLE_CLIENT_ID} + client-secret: ${APPLE_CLIENT_SECRET}