add files instead of waiting for new generator-jhipster release

jhipster · Oct 21, 2022 · 1e426fd · 1e426fd
1 parent f28b119
commit 1e426fd
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/generators/server/files.js b/generators/server/files.js
@@ -19,10 +19,6 @@
 const cleanup = require('generator-jhipster/generators/cleanup');
 const constants = require('generator-jhipster/generators/generator-constants');
 const jhipsterFiles = require('generator-jhipster/generators/server/files').serverFiles;
-let { serverFiles: sqlServerFiles } = require('generator-jhipster/generators/server/files-sql');
-const { addSectionsCondition } = require('generator-jhipster/generators/utils');
-
-sqlServerFiles = addSectionsCondition(sqlServerFiles, data => data.databaseTypeSql);
 
 /* Constants use throughout */
 const INTERPOLATE_REGEX = constants.INTERPOLATE_REGEX;
@@ -644,7 +640,19 @@ const serverFiles = {
 };
 
 const serverFilesFromJHipster = {
-    docker: [...jhipsterFiles.docker, ...sqlServerFiles.docker],
+    docker: [
+        ...jhipsterFiles.docker,
+        {
+            condition: generator => generator.databaseTypeSql && !generator.prodDatabaseTypeOracle,
+            path: DOCKER_DIR,
+            templates: [{ file: generator => `${generator.prodDatabaseType}.yml` }],
+        },
+        {
+            condition: generator => generator.databaseTypeSql && !generator.devDatabaseTypeOracle && !generator.devDatabaseTypeH2Any,
+            path: DOCKER_DIR,
+            templates: [{ file: generator => `${generator.devDatabaseType}.yml` }],
+        },
+    ],
     npmWrapper: [
         {
             condition: generator => generator.buildTool === 'maven',