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
2 changes: 1 addition & 1 deletion .github/workflows/build-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
3 changes: 2 additions & 1 deletion docker/prod/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
backend:
image: yugyeong390/photi-server:1.1.4
image: yugyeong390/photi-server:1.2.0
env_file:
- .env
ports:
Expand All @@ -10,6 +10,7 @@ services:
environment:
- TZ=Asia/Seoul
- LOGGING_FILE_PATH=/logs
restart: always
networks:
- server-network
redis:
Expand Down
2 changes: 1 addition & 1 deletion photi-apis/enduser/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ springdoc:
swagger-ui:
enabled: false

management: # TODO 수정 필요
management:
endpoints:
enabled-by-default: false
jmx:
Expand Down
6 changes: 6 additions & 0 deletions photi-core/domain/src/main/resources/application-domain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions photi-core/infra/src/main/resources/application-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}