diff --git a/build.gradle b/build.gradle index 3b1a564..796ba83 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,8 @@ dependencies { runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' - runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.3.3' +// runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.3.3' + runtimeOnly 'mysql:mysql-connector-java:8.0.33' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' diff --git a/compose.yaml b/compose.yaml index a32d7d2..0c2a2b3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,17 +1,17 @@ services: - mariadb: - image: 'mariadb:latest' + mysql: + image: 'mysql:8.0' environment: - 'MYSQL_DATABASE=hi_meow' - 'MYSQL_USER=admin' - 'MYSQL_PASSWORD=1234' - - 'MARIADB_ROOT_PASSWORD=1234' + - 'MYSQL_ROOT_PASSWORD=1234' ports: - '3306:3306' volumes: - - mariadb_data:/var/lib/mysql + - mysql_data:/var/lib/mysql healthcheck: - test: mariadb --user=root --password=1234 -e 'SELECT 1;' + test: mysql --user=root --password=1234 -e 'SELECT 1;' interval: 1s timeout: 1s retries: 5 @@ -25,14 +25,14 @@ services: - '8080:8080' environment: - 'SPRING_PROFILES_ACTIVE=local' - - 'SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/hi_meow' + - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hi_meow' - 'SPRING_DATASOURCE_USERNAME=admin' - 'SPRING_DATASOURCE_PASSWORD=1234' - 'LOGGING_LEVEL_ROOT=INFO' - 'LOGGING_LEVEL_COM_EXAMPLE=DEBUG' depends_on: - mariadb: + mysql: condition: service_healthy volumes: - mariadb_data: \ No newline at end of file + mysql_data: \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index c7b764f..2d1d7e0 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mariadb://localhost:3306/hi_meow + url: jdbc:mysql://mysql_spring:3306/hi_meow username: admin password: 1234 - driver-class-name: org.mariadb.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver jpa: hibernate: ddl-auto: update @@ -11,7 +11,7 @@ spring: properties: hibernate: format_sql: true - dialect: org.hibernate.dialect.MariaDBDialect + dialect: org.hibernate.dialect.MySQLDialect mvc: cors: allowed-origins: http://localhost:80,http://localhost:3000