Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/lazaroDevelop' into lazaroDevelop
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Utils/Utils.py
  • Loading branch information
lazarocosta committed May 27, 2020
2 parents 53d2635 + 7cf53f6 commit b2454ba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:
mongodb:
container_name: archgraph-mongodb
image: mongo:latest
command: ["--bind_ip_all"]
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: rootpassword
Expand Down Expand Up @@ -32,7 +33,7 @@ services:
dockerfile: Dockerfile
args:
SOURCE_BRANCH: master
PRELOAD_GRAPH: "true"
PRELOAD_GRAPH: "1"
context: .
environment:
- "NEO4J_CONNECTION_STRING=bolt://neo4j:password@archgraph-neo4j:7687"
Expand Down
1 change: 1 addition & 0 deletions src/Routes/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ def search_specific(class_name, query):
# get_all_records_from_collection("createdTemplate")
if __name__ == "__main__":
if args.host is not None and args.host != "":
app.logger.debug('Archgraph running with a custom host setting: %s', args.host)
app.run(host=args.host)
else:
app.run(host='127.0.0.1')

0 comments on commit b2454ba

Please sign in to comment.