diff --git a/docker-compose.yml b/docker-compose.yml index 7d49e937b..11d7027c0 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: depends_on: - mysql environment: - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo?sslMode=REQUIRED SPRING_DATASOURCE_USERNAME: mysqluser SPRING_DATASOURCE_PASSWORD: mysqlpw SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver diff --git a/ftgo-application/src/main/resources/application.properties b/ftgo-application/src/main/resources/application.properties index 1837281b6..757b18111 100644 --- a/ftgo-application/src/main/resources/application.properties +++ b/ftgo-application/src/main/resources/application.properties @@ -2,8 +2,9 @@ spring.application.name=ftgo-application spring.jpa.generate-ddl=false logging.level.org.springframework.orm.jpa=INFO -logging.level.org.hibernate.SQL=DEBUG -spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo?useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.username=mysqluser -spring.datasource.password=mysqlpw +logging.level.org.hibernate.SQL=WARN +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=WARN +spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo?sslMode=REQUIRED +spring.datasource.username=${SPRING_DATASOURCE_USERNAME:mysqluser} +spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:mysqlpw} spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 13ca527a6..2345df654 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -1,2 +1,2 @@ -FROM mysql:5.7.13 +FROM mysql:5.7.44 COPY schema.sql /docker-entrypoint-initdb.d/schema.sql