From b3d5687e5056355db81459df25d7e98b4cd14afd Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 4 Sep 2025 17:26:08 +0900 Subject: [PATCH 1/4] chore: docker compose local mariadb set up --- docker/local/docker-compose.yml | 39 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml index de4c72b2..b02dd2eb 100644 --- a/docker/local/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -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: admin@example.com - 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이 루트에 없으면 맞게 조정) @@ -47,5 +47,4 @@ services: - ../../apps/pre-processing-service/dev.env # 개발 volumes: - postgres_data: - pgadmin_data: \ No newline at end of file + mariadb_data: \ No newline at end of file From 4321712c964e077f31b924d86cbb4cf34b5b89e0 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 4 Sep 2025 17:27:55 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20postgre=20driver=20maridb=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/user-service/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user-service/build.gradle b/apps/user-service/build.gradle index 4da4d368..4816eae3 100644 --- a/apps/user-service/build.gradle +++ b/apps/user-service/build.gradle @@ -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' From 9ba85dab1a510bbbb2cb996998c3b437fc22be80 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 4 Sep 2025 17:28:16 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20develop=20=ED=99=98=EA=B2=BD=20loc?= =?UTF-8?q?al=20compose=20mariadb=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-develop.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/user-service/src/main/resources/application-develop.yml b/apps/user-service/src/main/resources/application-develop.yml index d640ff77..818dcc48 100644 --- a/apps/user-service/src/main/resources/application-develop.yml +++ b/apps/user-service/src/main/resources/application-develop.yml @@ -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 @@ -26,4 +25,4 @@ mybatis: map-underscore-to-camel-case: true logging: - config: classpath:log4j2-develop.yml \ No newline at end of file + config: classpath:log4j2-develop.yml From dfbc19c8ab902b01a822abcbc1add3f920cb4298 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 4 Sep 2025 17:41:34 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20icebang=20package=20log=EA=B0=80=20?= =?UTF-8?q?=EA=B2=80=EC=B6=9C=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit application package명 오류 --- apps/user-service/src/main/resources/log4j2-develop.yml | 2 +- apps/user-service/src/main/resources/log4j2-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user-service/src/main/resources/log4j2-develop.yml b/apps/user-service/src/main/resources/log4j2-develop.yml index 63f4c280..d1afc02b 100644 --- a/apps/user-service/src/main/resources/log4j2-develop.yml +++ b/apps/user-service/src/main/resources/log4j2-develop.yml @@ -89,7 +89,7 @@ Configuration: - ref: file-error-appender # 2. 애플리케이션 로그 - - name: com.movement.mvp + - name: com.gltkorea.icebang additivity: "false" level: TRACE AppenderRef: diff --git a/apps/user-service/src/main/resources/log4j2-test.yml b/apps/user-service/src/main/resources/log4j2-test.yml index 05333338..80df15cd 100644 --- a/apps/user-service/src/main/resources/log4j2-test.yml +++ b/apps/user-service/src/main/resources/log4j2-test.yml @@ -38,7 +38,7 @@ Configuration: - ref: console-appender # 2. 애플리케이션 로그 - - name: com.movement + - name: com.gltkorea.icebang additivity: "false" level: INFO AppenderRef: