Skip to content
This repository has been archived by the owner on Apr 5, 2024. It is now read-only.

Commit

Permalink
add results client to docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
charhart committed Aug 14, 2018
1 parent c826404 commit 5e041a2
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,11 @@ SOLR_REPORT_DATE_FIELD=report_date
SOLR_SUBJECT_FIELD=subject
SOLR_REPORT_TYPE_FIELD=report_type

# RESULTS CLIENT
RESULTS_CLIENT_HOSTNAME=results-client
RESULTS_CLIENT_HOST_PORT=8200
RESULTS_CLIENT_CONTAINER_PORT=8201


#GENERIC
BASE_URL=http://localhost
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "utilities/ingest-client"]
path = utilities/ingest-client
url = https://github.com/ClarityNLP/ingest-client.git
[submodule "utilities/results-client"]
path = utilities/results-client
url = https://github.com/ClarityNLP/results-viewer
11 changes: 10 additions & 1 deletion docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ services:
context: ./utilities/ingest-client
dockerfile: Dockerfile.prod
ports:
- "${INGEST_CLIENT_HOST_PORT}:${INGESET_CLIENT_CONTAINER_PORT}"
- "${INGEST_CLIENT_HOST_PORT}:${INGEST_CLIENT_CONTAINER_PORT}"

mapper-api:
container_name: MAPPER_API
Expand Down Expand Up @@ -163,6 +163,15 @@ services:
env_file:
- .env

results-client:
container_name: RESULTS_CLIENT
hostname: ${RESULTS_CLIENT_HOSTNAME}
build:
context: ./utilities/results-client
dockerfile: Dockerfile.prod
ports:
- "${RESULTS_CLIENT_HOST_PORT}:${RESULTS_CLIENT_CONTAINER_PORT}"

swagger:
container_name: MAPPER_SWAGGER
hostname: ${MAPPER_SWAGGER_HOSTNAME}
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@ services:
volumes:
- 'mapper-redisdata:/data'

results-client:
container_name: RESULTS_CLIENT
hostname: ${RESULTS_CLIENT_HOSTNAME}
build:
context: ./utilities/results-client
dockerfile: Dockerfile
environment:
- "PORT=${RESULTS_CLIENT_HOST_PORT}"
ports:
- "${RESULTS_CLIENT_HOST_PORT}:${RESULTS_CLIENT_CONTAINER_PORT}"

swagger:
container_name: MAPPER_Swagger_Docs
hostname: ${MAPPER_SWAGGER_HOSTNAME}
Expand Down
3 changes: 2 additions & 1 deletion run_claritynlp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ echo "Updating repository..."
git pull

echo "Updating submodules..."
git submodule update --recursive
git submodule update --recursive --remote


echo "Running ClarityNLP..."
docker-compose up --build
Expand Down
1 change: 1 addition & 0 deletions utilities/results-client
Submodule results-client added at bebe5b

0 comments on commit 5e041a2

Please sign in to comment.