diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d45b4a6..3983d35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ services: - mysql:latest stages: - - build - prepare - test - deploy diff --git a/gradlew.bat b/gradlew.bat index 85ded3c..62bd9b9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -85,7 +85,6 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -echo JAVA_OPTS: %JAVA_OPTS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% :end diff --git a/src/main/resources/application-deploy.properties b/src/main/resources/application-deploy.properties index 52f5ee2..31f76ef 100644 --- a/src/main/resources/application-deploy.properties +++ b/src/main/resources/application-deploy.properties @@ -2,7 +2,7 @@ spring.profiles.active=deploy ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) #spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false spring.datasource.url = jdbc:mysql://mysql:3306/aitrainer?serverTimezone=CET&useSSL=false&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true -spring.datasource.username = aitrainer +spring.datasource.username = root spring.datasource.password = andio2009