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 apps/user-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dependencies {

// Database
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.postgresql:postgresql'
implementation 'org.mariadb.jdbc:mariadb-java-client:3.3.3'

// Test Dependencies
testImplementation 'org.springframework.boot:spring-boot-starter-test'
Expand Down
11 changes: 5 additions & 6 deletions apps/user-service/src/main/resources/application-develop.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# application-develop.yml
spring:
config:
activate:
on-profile: develop

# PostgreSQL 데이터베이스 연결 설정
# MariaDB 데이터베이스 연결 설정
datasource:
url: jdbc:postgresql://localhost:5432/pre_process
username: postgres
url: jdbc:mariadb://localhost:3306/pre_process
username: mariadb
password: qwer1234
driver-class-name: org.postgresql.Driver
driver-class-name: org.mariadb.jdbc.Driver

hikari:
connection-timeout: 30000
Expand All @@ -26,4 +25,4 @@ mybatis:
map-underscore-to-camel-case: true

logging:
config: classpath:log4j2-develop.yml
config: classpath:log4j2-develop.yml
2 changes: 1 addition & 1 deletion apps/user-service/src/main/resources/log4j2-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Configuration:
- ref: file-error-appender

# 2. 애플리케이션 로그
- name: com.movement.mvp
- name: com.gltkorea.icebang
additivity: "false"
level: TRACE
AppenderRef:
Expand Down
2 changes: 1 addition & 1 deletion apps/user-service/src/main/resources/log4j2-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Configuration:
- ref: console-appender

# 2. 애플리케이션 로그
- name: com.movement
- name: com.gltkorea.icebang
additivity: "false"
level: INFO
AppenderRef:
Expand Down
39 changes: 19 additions & 20 deletions docker/local/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
version: '3.8'

services:
postgres:
image: postgres:15
container_name: postgres_db
mariadb:
image: mariadb:11.4
container_name: mariadb_db
restart: unless-stopped
environment:
POSTGRES_DB: pre_process
POSTGRES_USER: postgres
POSTGRES_PASSWORD: qwer1234
MYSQL_ROOT_PASSWORD: qwer1234
MYSQL_DATABASE: pre_process
MYSQL_USER: mariadb
MYSQL_PASSWORD: qwer1234
ports:
- "5432:5432"
- "3306:3306"
volumes:
- postgres_data:/var/lib/postgresql/data
- ./init-scripts:/docker-entrypoint-initdb.d
- mariadb_data:/var/lib/mysql
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-pqwer1234"]
interval: 10s
timeout: 5s
retries: 5

pgadmin:
image: dpage/pgadmin4:latest
container_name: pgadmin
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: phpmyadmin
restart: unless-stopped
environment:
PGADMIN_DEFAULT_EMAIL: [email protected]
PGADMIN_DEFAULT_PASSWORD: qwer1234
PMA_HOST: mariadb
PMA_USER: root
PMA_PASSWORD: qwer1234
ports:
- "8888:80"
volumes:
- pgadmin_data:/var/lib/pgadmin
depends_on:
- postgres
- mariadb

pre-processing-service:
build:
context: ../../apps/pre-processing-service # 프로젝트 루트 (Dockerfile이 루트에 없으면 맞게 조정)
Expand All @@ -47,5 +47,4 @@ services:
- ../../apps/pre-processing-service/dev.env # 개발

volumes:
postgres_data:
pgadmin_data:
mariadb_data:
Loading