Merge branch 'release-0.1'

.env.example

@@ -113,4 +113,6 @@ USE_MEMORY_CACHING=false
 USE_PRECOMPUTED_SEGMENTATION=false
 USE_REORDERED_NLPQL=false
 USE_REDIS_CACHING=false
-LUIGI_WORKERS=4
+LUIGI_WORKERS=4
+
+NLP_EXPRESSION_EVALUATOR=mongo

.gitignore

@@ -19,3 +19,11 @@ notebooks/.ipynb_checkpoints
 notebooks/cooking/.ipynb_checkpoints
 project.cfg
 keys.py
+is4/bin/
+is4/obj/
+env.mk
+identity-and-access-proxy/package-lock.json
+identity-provider/bin
+identity-provider/obj
+identity-provider/identityserver4_log.txt
+certs/claritynlp.dev*

.gitmodules

@@ -1,21 +1,32 @@
 [submodule "utilities/mapper-api"]
 	path = utilities/mapper-api
 	url = https://github.com/ClarityNLP/report-type-mapper-api.git
+	branch = .
 [submodule "utilities/mapper-client"]
 	path = utilities/mapper-client
 	url = https://github.com/ClarityNLP/report-type-mapper-client.git
+	branch = .
 [submodule "evaluation/validation"]
 	path = evaluation/validation
 	url = https://github.com/ClarityNLP/validation-framework.git
+	branch = .
 [submodule "utilities/ingest-api"]
 	path = utilities/ingest-api
 	url = https://github.com/ClarityNLP/ingest-api.git
+	branch = .
 [submodule "utilities/ingest-client"]
 	path = utilities/ingest-client
 	url = https://github.com/ClarityNLP/ingest-client.git
+	branch = .
 [submodule "utilities/results-client"]
 	path = utilities/results-client
 	url = https://github.com/ClarityNLP/results-viewer
+	branch = .
 [submodule "utilities/export-api"]
 	path = utilities/export-api
 	url = https://github.com/ClarityNLP/ClarityNLPExportResults.git
+	branch = .
+[submodule "utilities/dashboard-client"]
+	path = utilities/dashboard-client
+	url = https://github.com/ClarityNLP/dashboard-client.git
+	branch = .

Makefile

@@ -0,0 +1,66 @@
+-include env.mk
+
+env.mk: env.sh
+	sed 's/"//g ; s/=/:=/' < $< > $@
+
+DOCKER_VERSION := $(shell docker --version 2>/dev/null)
+DOCKER_COMPOSE_VERSION := $(shell docker-compose --version 2>/dev/null)
+
+all:
+ifndef DOCKER_VERSION
+    $(error Makefile -- command docker is not available, please install Docker)
+endif
+ifndef DOCKER_COMPOSE_VERSION
+    $(error Makefile -- command docker-compose is not available, please install Docker)
+endif
+ifeq ($(OS),Windows_NT)
+    $(error Makefile -- local dns solution not ready for windows)
+else
+    UNAME_S := $(shell uname -s)
+    $(info Makefile -- non windows distro detected)
+ifeq ($(UNAME_S),Darwin)
+    $(info Makefile -- OSX detected)
+ifneq ("$(wildcard /etc/resolver/dev)","")
+    $(info Makefile -- dev resolver already exists at /etc/resolver/dev)
+else
+    $(info Makefile -- dev resolver not found. Creating /etc/resolver/dev)
+    $(shell sudo mkdir -p /etc/resolver/ && echo "nameserver 127.0.0.1" | sudo tee -a /etc/resolver/dev > /dev/null)
+endif
+endif
+ifeq ($(UNAME_S),Linux)
+    $(error local dns solution not ready for linux)
+endif
+endif
+
+start-clarity:
+		docker-compose up --build
+
+stop-clarity:
+		docker-compose down --remove-orphans
+
+start-clarity-insecure:
+		docker-compose -f docker-compose.insecure.yml up --build
+
+stop-clarity-insecure:
+		docker-compose -f docker-compose.insecure.yml down --remove-orphans
+
+start-clarity-prod:
+		docker-compose -f docker-compose.prod.yml up --build
+
+stop-clarity-prod:
+		docker-compose -f docker-compose.prod.yml down --remove-orphans
+
+start-clarity-prod-local:
+		docker-compose -f docker-compose.prod.dnsmasq.yml up --build
+
+stop-clarity-prod-local:
+		docker-compose -f docker-compose.prod.dnsmasq.yml down --remove-orphans
+
+restart-clarity:
+		docker-compose restart
+
+rm-clarity:
+		docker-compose kill
+		docker-compose rm -f
+
+reset-clarity: rm-clarity start-clarity

dnsmasq.conf

@@ -0,0 +1,12 @@
+#dnsmasq config, for a complete example, see:
+#  http://oss.segetech.com/intra/srv/dnsmasq.conf
+#log all dns queries
+log-queries
+#dont use hosts nameservers
+no-resolv
+#use cloudflare as default nameservers, prefer 1^4
+server=1.0.0.1
+server=1.1.1.1
+strict-order
+#explicitly define host-ip mappings
+address=/.claritynlp.dev/127.0.0.1