diff --git a/road/.gitignore b/road/.gitignore index c2065bc2..d8ecf8dd 100644 --- a/road/.gitignore +++ b/road/.gitignore @@ -35,3 +35,6 @@ out/ ### VS Code ### .vscode/ + +### +.env \ No newline at end of file diff --git a/road/build.gradle b/road/build.gradle index e9e728d0..2400f219 100644 --- a/road/build.gradle +++ b/road/build.gradle @@ -23,10 +23,10 @@ repositories { } dependencies { -// implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' -// runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' + runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/road/database/Dockerfile b/road/database/Dockerfile new file mode 100644 index 00000000..a0d7173f --- /dev/null +++ b/road/database/Dockerfile @@ -0,0 +1,3 @@ +FROM mariadb:10 + +ENV TZ=Asia/Seoul \ No newline at end of file diff --git a/road/database/config/mariadb.cnf b/road/database/config/mariadb.cnf new file mode 100644 index 00000000..f8f5b539 --- /dev/null +++ b/road/database/config/mariadb.cnf @@ -0,0 +1,13 @@ +[client] +default-character-set=utf8mb4 + +[mysql] +default-character-set=utf8mb4 + +[mysqld] +default-character-set=utf8mb4 +collation-server=utf8mb4_unicode_ci +skip-character-set-client-handshake + +[mysqldump] +default-character-set=utf8mb4 \ No newline at end of file diff --git a/road/docker-compose-local.yml b/road/docker-compose-local.yml new file mode 100644 index 00000000..a19e3c43 --- /dev/null +++ b/road/docker-compose-local.yml @@ -0,0 +1,23 @@ +version: "3.8" +services: + pharmacy-recommendation-redis: + container_name: pharmacy-recommendation-redis + build: + dockerfile: Dockerfile + context: ./redis + image: haerong22/pharmacy-recommendation-redis + ports: + - "6379:6379" + pharmacy-recommendation-database: + container_name: pharmacy-recommendation-database + build: + dockerfile: Dockerfile + context: ./database + image: haerong22/pharmacy-recommendation-database + environment: + - MARIADB_DATABASE=pharmacy-recommendation + - MARIADB_ROOT_PASSWORD=${SPRING_DATASOURCE_PASSWORD} + volumes: + - ./database/config:/etc/mysql/conf.d + ports: + - "3306:3306" \ No newline at end of file diff --git a/road/redis/Dockerfile b/road/redis/Dockerfile new file mode 100644 index 00000000..502781cc --- /dev/null +++ b/road/redis/Dockerfile @@ -0,0 +1,3 @@ +FROM redis:6 + +ENV TZ=Asia/Seoul \ No newline at end of file diff --git a/road/src/main/resources/application.yml b/road/src/main/resources/application.yml index 1caaf454..55da50ac 100644 --- a/road/src/main/resources/application.yml +++ b/road/src/main/resources/application.yml @@ -18,6 +18,18 @@ spring: config: activate: on-profile: local + datasource: + driver-class-name: org.mariadb.jdbc.Driver + url: jdbc:mariadb://localhost:3306/pharmacy-recommendation + username: ${SPRING_DATASOURCE_USERNAME} + password: ${SPRING_DATASOURCE_PASSWORD} + redis: + host: localhost + port: 6379 + jpa: + hibernate: + ddl-auto: create + show-sql: true --- spring: