spring-boot: adjusts to docker compose integration (#27437)

jhipster · Oct 4, 2024 · e22adee · e22adee
1 parent cb75328
commit e22adee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs
@@ -87,7 +87,7 @@ spring:
       additional-exclude: static/**<% if (devDatabaseTypeH2Any) { %>,.h2.server.properties<% } %>
     livereload:
       enabled: false # we use Webpack dev server + BrowserSync for livereload
-<%_ if (devDatabaseTypeH2Any) { _%>
+<%_ if (devDatabaseTypeH2Any && 'dockerServices' in locals && dockerServices && dockerServices.length > 1) { _%>
   docker:
     compose:
       enabled: <%- authenticationTypeOauth2 || messageBrokerAny || serviceDiscoveryAny || cacheProviderRedis %>

diff --git a/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs b/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs
@@ -269,14 +269,16 @@ spring:
           group: <%= dasherizedBaseName %>
   <%_ } _%>
 <%_ } _%>
+<%_ if ('dockerServices' in locals && dockerServices && dockerServices.length > 1) { _%>
   docker:
     compose:
       enabled: true
       lifecycle-management: start-only
-<%_ if (applicationTypeMicroservice) { _%>
+  <%_ if (applicationTypeMicroservice) { _%>
       file: <%- dockerServicesDir %><%- databaseTypeSql ? prodDatabaseType : databaseType %>.yml
-<%_ } else { _%>
+  <%_ } else { _%>
       file: <%- dockerServicesDir %>services.yml
+  <%_ } _%>
 <%_ } _%>
   profiles:
     # The commented value for `active` can be replaced with valid Spring profiles to load.