Merge branch 'release-0.1.1'

ClarityNLP · May 10, 2019 · d1c9b6e · d1c9b6e
2 parents 5c092bf + 38a164a
commit d1c9b6e
Show file tree

Hide file tree

Showing 20 changed files with 1,097 additions and 928 deletions.
diff --git a/docker-compose.insecure.yml b/docker-compose.insecure.yml
@@ -201,6 +201,7 @@ services:
       - /app/wait-for-it-extra.sh
       - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
       - ${REDIS_HOSTNAME}:${REDIS_CONTAINER_PORT}
+      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
       - ${INGEST_MONGO_HOSTNAME}:${INGEST_MONGO_CONTAINER_PORT}
       - --timeout=420
       - --
@@ -213,22 +214,29 @@ services:
       - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
       - NLP_CORE_NAME=${NLP_CORE_NAME}
       - NLP_SOLR_URL_TOP_LEVEL=${NLP_SOLR_URL_TOP_LEVEL}
+      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
+      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
+      - INTERVAL=${INTERVAL}
       - INGEST_MONGO_USERNAME=${INGEST_MONGO_USERNAME}
       - INGEST_MONGO_PASSWORD=${INGEST_MONGO_PASSWORD}
       - INGEST_MONGO_HOSTNAME=${INGEST_MONGO_HOSTNAME}
       - INGEST_MONGO_CONTAINER_PORT=${INGEST_MONGO_CONTAINER_PORT}
       - INGEST_MONGO_DATABASE=${INGEST_MONGO_DATABASE}
-      - BASE_URL=${BASE_URL}
       - INGEST_CLIENT_HOST_PORT=${INGEST_CLIENT_HOST_PORT}
       - INGEST_API_LOG_LEVEL=${INGEST_API_LOG_LEVEL}
       - REDIS_HOSTNAME=${REDIS_HOSTNAME}
       - REDIS_CONTAINER_PORT=${REDIS_CONTAINER_PORT}
+      - PROTOCOL=${PROTOCOL}
+      - DOMAIN=${DOMAIN}
+      - INGEST_CLIENT_SUBDOMAIN=${INGEST_CLIENT_SUBDOMAIN}
+      - DASHBOARD_CLIENT_SUBDOMAIN=${DASHBOARD_CLIENT_SUBDOMAIN}
     networks:
       - clarity
     depends_on:
       - ingest-mongo
       - redis
       - nlp-solr
+      - nlp-api
 
   ingest-mongo:
     container_name: ${INGEST_MONGO_CONTAINER_NAME}
@@ -315,36 +323,6 @@ services:
     networks:
       - clarity
 
-  dashboard-api:
-    container_name: DASHBOARD_API
-    hostname: ${DASHBOARD_API_HOSTNAME}
-    build: ./utilities/dashboard-client
-    expose:
-      - ${DASHBOARD_API_CONTAINER_PORT}
-    volumes:
-      - ./utilities/dashboard-client:/app
-      - /app/node_modules
-    entrypoint:
-      - /app/wait-for-it-extra.sh
-      - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
-      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
-      - --timeout=420
-      - --
-      - pm2-dev
-    command: process.json
-    environment:
-      - DASHBOARD_API_CONTAINER_PORT=${DASHBOARD_API_CONTAINER_PORT}
-      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
-      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
-      - NLP_SOLR_HOSTNAME=${NLP_SOLR_HOSTNAME}
-      - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
-      - INTERVAL=${INTERVAL}
-    networks:
-      - clarity
-    depends_on:
-      - nlp-api
-      - nlp-solr
-
   nginx-proxy:
     container_name: NGINX_PROXY
     hostname: nginx-proxy

diff --git a/docker-compose.prod.dnsmasq.yml b/docker-compose.prod.dnsmasq.yml
@@ -234,6 +234,7 @@ services:
       - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
       - ${REDIS_HOSTNAME}:${REDIS_CONTAINER_PORT}
       - ${INGEST_MONGO_HOSTNAME}:${INGEST_MONGO_CONTAINER_PORT}
+      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
       - --timeout=420
       - --
       - pm2-runtime
@@ -245,6 +246,9 @@ services:
       - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
       - NLP_CORE_NAME=${NLP_CORE_NAME}
       - NLP_SOLR_URL_TOP_LEVEL=${NLP_SOLR_URL_TOP_LEVEL}
+      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
+      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
+      - INTERVAL=${INTERVAL}
       - INGEST_MONGO_USERNAME=${INGEST_MONGO_USERNAME}
       - INGEST_MONGO_PASSWORD=${INGEST_MONGO_PASSWORD}
       - INGEST_MONGO_HOSTNAME=${INGEST_MONGO_HOSTNAME}
@@ -257,12 +261,14 @@ services:
       - PROTOCOL=${PROTOCOL}
       - DOMAIN=${DOMAIN}
       - INGEST_CLIENT_SUBDOMAIN=${INGEST_CLIENT_SUBDOMAIN}
+      - DASHBOARD_CLIENT_SUBDOMAIN=${DASHBOARD_CLIENT_SUBDOMAIN}
     networks:
       - clarity
     depends_on:
       - ingest-mongo
       - redis
       - nlp-solr
+      - nlp-api
 
   ingest-mongo:
     container_name: ${INGEST_MONGO_CONTAINER_NAME}
@@ -353,35 +359,6 @@ services:
     networks:
       - clarity
 
-  dashboard-api:
-    container_name: DASHBOARD_API
-    hostname: ${DASHBOARD_API_HOSTNAME}
-    build: ./utilities/dashboard-client
-    volumes:
-      - /app/node_modules
-    expose:
-      - ${DASHBOARD_API_CONTAINER_PORT}
-    entrypoint:
-      - /app/wait-for-it-extra.sh
-      - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
-      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
-      - --timeout=420
-      - --
-      - pm2-runtime
-    command: index.js
-    environment:
-      - DASHBOARD_API_CONTAINER_PORT=${DASHBOARD_API_CONTAINER_PORT}
-      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
-      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
-      - NLP_SOLR_HOSTNAME=${NLP_SOLR_HOSTNAME}
-      - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
-      - INTERVAL=${INTERVAL}
-    networks:
-      - clarity
-    depends_on:
-      - nlp-api
-      - nlp-solr
-
   nginx-proxy:
     container_name: NGINX_PROXY
     hostname: nginx-proxy

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -238,6 +238,7 @@ services:
       - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
       - ${REDIS_HOSTNAME}:${REDIS_CONTAINER_PORT}
       - ${INGEST_MONGO_HOSTNAME}:${INGEST_MONGO_CONTAINER_PORT}
+      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
       - --timeout=420
       - --
       - pm2-runtime
@@ -249,6 +250,9 @@ services:
       - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
       - NLP_CORE_NAME=${NLP_CORE_NAME}
       - NLP_SOLR_URL_TOP_LEVEL=${NLP_SOLR_URL_TOP_LEVEL}
+      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
+      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
+      - INTERVAL=${INTERVAL}
       - INGEST_MONGO_USERNAME=${INGEST_MONGO_USERNAME}
       - INGEST_MONGO_PASSWORD=${INGEST_MONGO_PASSWORD}
       - INGEST_MONGO_HOSTNAME=${INGEST_MONGO_HOSTNAME}
@@ -261,12 +265,14 @@ services:
       - PROTOCOL=${PROTOCOL}
       - DOMAIN=${DOMAIN}
       - INGEST_CLIENT_SUBDOMAIN=${INGEST_CLIENT_SUBDOMAIN}
+      - DASHBOARD_CLIENT_SUBDOMAIN=${DASHBOARD_CLIENT_SUBDOMAIN}
     networks:
       - clarity
     depends_on:
       - ingest-mongo
       - redis
       - nlp-solr
+      - nlp-api
 
   ingest-mongo:
     container_name: ${INGEST_MONGO_CONTAINER_NAME}
@@ -360,35 +366,6 @@ services:
     networks:
       - clarity
 
-  dashboard-api:
-    container_name: DASHBOARD_API
-    hostname: ${DASHBOARD_API_HOSTNAME}
-    build: ./utilities/dashboard-client
-    volumes:
-      - /app/node_modules
-    expose:
-      - ${DASHBOARD_API_CONTAINER_PORT}
-    entrypoint:
-      - /app/wait-for-it-extra.sh
-      - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
-      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
-      - --timeout=420
-      - --
-      - pm2-runtime
-    command: index.js
-    environment:
-      - DASHBOARD_API_CONTAINER_PORT=${DASHBOARD_API_CONTAINER_PORT}
-      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
-      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
-      - NLP_SOLR_HOSTNAME=${NLP_SOLR_HOSTNAME}
-      - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
-      - INTERVAL=${INTERVAL}
-    networks:
-      - clarity
-    depends_on:
-      - nlp-api
-      - nlp-solr
-
   nginx-proxy:
     container_name: NGINX_PROXY
     hostname: nginx-proxy

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -200,6 +200,7 @@ services:
       - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
       - ${REDIS_HOSTNAME}:${REDIS_CONTAINER_PORT}
       - ${INGEST_MONGO_HOSTNAME}:${INGEST_MONGO_CONTAINER_PORT}
+      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
       - --timeout=420
       - --
       - pm2-dev
@@ -211,6 +212,9 @@ services:
       - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
       - NLP_CORE_NAME=${NLP_CORE_NAME}
       - NLP_SOLR_URL_TOP_LEVEL=${NLP_SOLR_URL_TOP_LEVEL}
+      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
+      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
+      - INTERVAL=${INTERVAL}
       - INGEST_MONGO_USERNAME=${INGEST_MONGO_USERNAME}
       - INGEST_MONGO_PASSWORD=${INGEST_MONGO_PASSWORD}
       - INGEST_MONGO_HOSTNAME=${INGEST_MONGO_HOSTNAME}
@@ -223,12 +227,14 @@ services:
       - PROTOCOL=${PROTOCOL}
       - DOMAIN=${DOMAIN}
       - INGEST_CLIENT_SUBDOMAIN=${INGEST_CLIENT_SUBDOMAIN}
+      - DASHBOARD_CLIENT_SUBDOMAIN=${DASHBOARD_CLIENT_SUBDOMAIN}
     networks:
       - clarity
     depends_on:
       - ingest-mongo
       - redis
       - nlp-solr
+      - nlp-api
 
   ingest-mongo:
     container_name: ${INGEST_MONGO_CONTAINER_NAME}
@@ -315,36 +321,6 @@ services:
     networks:
       - clarity
 
-  dashboard-api:
-    container_name: DASHBOARD_API
-    hostname: ${DASHBOARD_API_HOSTNAME}
-    build: ./utilities/dashboard-client
-    expose:
-      - ${DASHBOARD_API_CONTAINER_PORT}
-    volumes:
-      - ./utilities/dashboard-client:/app
-      - /app/node_modules
-    entrypoint:
-      - /app/wait-for-it-extra.sh
-      - ${NLP_SOLR_HOSTNAME}:${NLP_SOLR_CONTAINER_PORT}
-      - ${NLP_API_HOSTNAME}:${NLP_API_CONTAINER_PORT}
-      - --timeout=420
-      - --
-      - pm2-dev
-    command: process.json
-    environment:
-      - DASHBOARD_API_CONTAINER_PORT=${DASHBOARD_API_CONTAINER_PORT}
-      - NLP_API_HOSTNAME=${NLP_API_HOSTNAME}
-      - NLP_API_CONTAINER_PORT=${NLP_API_CONTAINER_PORT}
-      - NLP_SOLR_HOSTNAME=${NLP_SOLR_HOSTNAME}
-      - NLP_SOLR_CONTAINER_PORT=${NLP_SOLR_CONTAINER_PORT}
-      - INTERVAL=${INTERVAL}
-    networks:
-      - clarity
-    depends_on:
-      - nlp-api
-      - nlp-solr
-
   nginx-proxy:
     container_name: NGINX_PROXY
     hostname: nginx-proxy