mirror of
https://github.com/datahub-project/datahub.git
synced 2025-12-13 11:06:30 +00:00
* feat: neo4j https support (#2101) Ability to specify http as well as https URI schemes in the 'NEO4J_HOST' variable.
This commit is contained in:
parent
85f4f88d7d
commit
4db9914432
2
docker/datahub-gms/env/docker.env
vendored
2
docker/datahub-gms/env/docker.env
vendored
@ -8,7 +8,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
|
|||||||
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
||||||
ELASTICSEARCH_HOST=elasticsearch
|
ELASTICSEARCH_HOST=elasticsearch
|
||||||
ELASTICSEARCH_PORT=9200
|
ELASTICSEARCH_PORT=9200
|
||||||
NEO4J_HOST=neo4j:7474
|
NEO4J_HOST=http://neo4j:7474
|
||||||
NEO4J_URI=bolt://neo4j
|
NEO4J_URI=bolt://neo4j
|
||||||
NEO4J_USERNAME=neo4j
|
NEO4J_USERNAME=neo4j
|
||||||
NEO4J_PASSWORD=datahub
|
NEO4J_PASSWORD=datahub
|
||||||
|
|||||||
2
docker/datahub-gms/env/docker.mariadb.env
vendored
2
docker/datahub-gms/env/docker.mariadb.env
vendored
@ -7,7 +7,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
|
|||||||
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
||||||
ELASTICSEARCH_HOST=elasticsearch
|
ELASTICSEARCH_HOST=elasticsearch
|
||||||
ELASTICSEARCH_PORT=9200
|
ELASTICSEARCH_PORT=9200
|
||||||
NEO4J_HOST=neo4j:7474
|
NEO4J_HOST=http://neo4j:7474
|
||||||
NEO4J_URI=bolt://neo4j
|
NEO4J_URI=bolt://neo4j
|
||||||
NEO4J_USERNAME=neo4j
|
NEO4J_USERNAME=neo4j
|
||||||
NEO4J_PASSWORD=datahub
|
NEO4J_PASSWORD=datahub
|
||||||
|
|||||||
2
docker/datahub-gms/env/docker.postgres.env
vendored
2
docker/datahub-gms/env/docker.postgres.env
vendored
@ -7,7 +7,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
|
|||||||
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
||||||
ELASTICSEARCH_HOST=elasticsearch
|
ELASTICSEARCH_HOST=elasticsearch
|
||||||
ELASTICSEARCH_PORT=9200
|
ELASTICSEARCH_PORT=9200
|
||||||
NEO4J_HOST=neo4j:7474
|
NEO4J_HOST=http://neo4j:7474
|
||||||
NEO4J_URI=bolt://neo4j
|
NEO4J_URI=bolt://neo4j
|
||||||
NEO4J_USERNAME=neo4j
|
NEO4J_USERNAME=neo4j
|
||||||
NEO4J_PASSWORD=datahub
|
NEO4J_PASSWORD=datahub
|
||||||
|
|||||||
@ -1,9 +1,14 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Add default URI (http) scheme if needed
|
||||||
|
if ! echo $NEO4J_HOST | grep -q "://" ; then
|
||||||
|
NEO4J_HOST="http://$NEO4J_HOST"
|
||||||
|
fi
|
||||||
|
|
||||||
dockerize \
|
dockerize \
|
||||||
-wait tcp://$EBEAN_DATASOURCE_HOST \
|
-wait tcp://$EBEAN_DATASOURCE_HOST \
|
||||||
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \
|
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \
|
||||||
-wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
|
-wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
|
||||||
-wait http://$NEO4J_HOST \
|
-wait $NEO4J_HOST \
|
||||||
-timeout 240s \
|
-timeout 240s \
|
||||||
java -jar /jetty-runner.jar /datahub/datahub-gms/bin/war.war
|
java -jar /jetty-runner.jar /datahub/datahub-gms/bin/war.war
|
||||||
2
docker/datahub-mae-consumer/env/docker.env
vendored
2
docker/datahub-mae-consumer/env/docker.env
vendored
@ -2,7 +2,7 @@ KAFKA_BOOTSTRAP_SERVER=broker:29092
|
|||||||
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
|
||||||
ELASTICSEARCH_HOST=elasticsearch
|
ELASTICSEARCH_HOST=elasticsearch
|
||||||
ELASTICSEARCH_PORT=9200
|
ELASTICSEARCH_PORT=9200
|
||||||
NEO4J_HOST=neo4j:7474
|
NEO4J_HOST=http://neo4j:7474
|
||||||
NEO4J_URI=bolt://neo4j
|
NEO4J_URI=bolt://neo4j
|
||||||
NEO4J_USERNAME=neo4j
|
NEO4J_USERNAME=neo4j
|
||||||
NEO4J_PASSWORD=datahub
|
NEO4J_PASSWORD=datahub
|
||||||
|
|||||||
@ -1,8 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Add default URI (http) scheme if needed
|
||||||
|
if ! echo $NEO4J_HOST | grep -q "://" ; then
|
||||||
|
NEO4J_HOST="http://$NEO4J_HOST"
|
||||||
|
fi
|
||||||
|
|
||||||
dockerize \
|
dockerize \
|
||||||
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \
|
-wait tcp://$KAFKA_BOOTSTRAP_SERVER \
|
||||||
-wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
|
-wait http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT \
|
||||||
-wait http://$NEO4J_HOST \
|
-wait $NEO4J_HOST \
|
||||||
-timeout 240s \
|
-timeout 240s \
|
||||||
java -jar /datahub/datahub-mae-consumer/bin/mae-consumer-job.jar
|
java -jar /datahub/datahub-mae-consumer/bin/mae-consumer-job.jar
|
||||||
Loading…
x
Reference in New Issue
Block a user