Merge pull request #4034 from pascalgrimaud/neo4j-docker-compose

Neo4j : add to start docker compose script
jhipster · Oct 18, 2022 · d0a4d73 · d0a4d73
2 parents 473a10e + 855b450
commit d0a4d73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...h/jhipster/lite/generator/server/springboot/database/neo4j/domain/Neo4jModuleFactory.java b/...h/jhipster/lite/generator/server/springboot/database/neo4j/domain/Neo4jModuleFactory.java
@@ -32,7 +32,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
       .startupCommand(DOCKER_COMPOSE_COMMAND)
       .context()
       .put("neo4jDockerImage", dockerImages.get("neo4j").fullName())
-      .and()
+        .and()
       .javaDependencies()
         .addDependency(groupId("org.springframework.boot"), artifactId("spring-boot-starter-data-neo4j"))
         .addDependency(testContainerDependency())
@@ -45,12 +45,12 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .add(SOURCE.template("spring.factories"), to("src/test/resources/META-INF/spring.factories"))
         .and()
       .springMainProperties()
-          .set(propertyKey("spring.neo4j.uri"), propertyValue("bolt://localhost:7687"))
-          .set(propertyKey("spring.neo4j.pool.metrics-enabled"), propertyValue("true"))
-          .and()
+        .set(propertyKey("spring.neo4j.uri"), propertyValue("bolt://localhost:7687"))
+        .set(propertyKey("spring.neo4j.pool.metrics-enabled"), propertyValue("true"))
+        .and()
       .springTestProperties()
-          .set(propertyKey("spring.neo4j.uri"), propertyValue("${TEST_NEO4J_URI}"))
-          .and()
+        .set(propertyKey("spring.neo4j.uri"), propertyValue("${TEST_NEO4J_URI}"))
+        .and()
       .springMainLogger("org.neo4j.driver", LogLevel.WARN)
       .springTestLogger("org.neo4j.driver", LogLevel.WARN)
       .springTestLogger("com.github.dockerjava", LogLevel.WARN)

diff --git a/tests-ci/start_docker_compose.sh b/tests-ci/start_docker_compose.sh
@@ -39,6 +39,9 @@ fi
 if [ -a src/main/docker/mariadb.yml ]; then
   docker compose -f src/main/docker/mariadb.yml up -d
 fi
+if [ -a src/main/docker/neo4j.yml ]; then
+  docker compose -f src/main/docker/neo4j.yml up -d
+fi
 if [ -a src/main/docker/mssql.yml ]; then
   docker compose -f src/main/docker/mssql.yml up -d
   echo "*** wait 40sec"