remove jib-cache dir

jhipster · Jun 16, 2022 · bcdf3a8 · bcdf3a8
1 parent f29fbe8
commit bcdf3a8
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 4 deletions.
diff --git a/generators/docker-base.js b/generators/docker-base.js
@@ -20,7 +20,6 @@ const shelljs = require('shelljs');
 const chalk = require('chalk');
 const _ = require('lodash');
 
-const { defaultConfig } = require('./generator-defaults');
 const dockerUtils = require('./docker-utils');
 const { getBase64Secret } = require('./utils');
 const { MAVEN } = require('../jdl/jhipster/build-tool-types');

diff --git a/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs b/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs
@@ -1024,8 +1024,8 @@
     {
       "id": "6e8deddb-b4d6-4e2e-b389-b397d3f74fcd",
       "clientId": "web_app",
-      "rootUrl": "http://localhost:<%= serverPort %>",
-      "adminUrl": "http://localhost:<%= serverPort %>",
+      "rootUrl": "http://localhost:<%= composePort %>",
+      "adminUrl": "http://localhost:<%= composePort %>",
       "surrogateAuthRequired": false,
       "enabled": true,
       "alwaysDisplayInConsole": false,

diff --git a/generators/docker-prompts.js b/generators/docker-prompts.js
@@ -21,7 +21,6 @@ const shelljs = require('shelljs');
 const { loadConfigs, setClusteredApps } = require('./docker-base');
 const { getBase64Secret } = require('./utils');
 const { MICROSERVICE, MONOLITH, GATEWAY } = require('../jdl/jhipster/application-types');
-const { COUCHBASE, MONGODB } = require('../jdl/jhipster/database-types');
 const { PROMETHEUS } = require('../jdl/jhipster/monitoring-types');
 const monitoring = require('../jdl/jhipster/monitoring-types');
 

diff --git a/test/templates/compose/01-gateway/target/jib-cache/.gitkeep b/test/templates/compose/01-gateway/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/02-mysql/target/jib-cache/.gitkeep b/test/templates/compose/02-mysql/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/03-psql/target/jib-cache/.gitkeep b/test/templates/compose/03-psql/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/04-mongo/target/jib-cache/.gitkeep b/test/templates/compose/04-mongo/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/05-cassandra/target/jib-cache/.gitkeep b/test/templates/compose/05-cassandra/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/07-mariadb/target/jib-cache/.gitkeep b/test/templates/compose/07-mariadb/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/08-monolith/target/jib-cache/.gitkeep b/test/templates/compose/08-monolith/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/09-kafka/target/jib-cache/.gitkeep b/test/templates/compose/09-kafka/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/10-couchbase/target/jib-cache/.gitkeep b/test/templates/compose/10-couchbase/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/11-mssql/target/jib-cache/.gitkeep b/test/templates/compose/11-mssql/target/jib-cache/.gitkeep
diff --git a/test/templates/compose/12-oracle/target/jib-cache/.gitkeep b/test/templates/compose/12-oracle/target/jib-cache/.gitkeep