Skip to content

Commit c7028a8

Browse files
authored
Adding check-search submodule (#56)
* Adding check-search submodule * add submodule to the repo * update the readme with information about available services and containers * update the architecture diagram (svg and png) with `check-search` consuming `check-api` * update docker configurations * add image_names for testing * Updating travis config to wait for check-search * Defining DEPLOY_ENV & dependency for check-search * Updating check-search to test travis config
1 parent b8b3e12 commit c7028a8

9 files changed

+205
-65
lines changed

.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@
3838
path = fetch
3939
url = [email protected]:meedan/fetch.git
4040
branch = develop
41+
[submodule "check-search"]
42+
path = check-search
43+
url = [email protected]:meedan/check-search.git
44+
branch = develop

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ script:
1818
- if (( $(curl -s -o /dev/null -w "%{http_code}" http://localhost:3100)!= "200" )); then exit 1; fi;
1919
- if (( $(curl -s -o /dev/null -w "%{http_code}" http://localhost:3333)!= "200" )); then exit 1; fi;
2020
- if (( $(curl -s -o /dev/null -w "%{http_code}" http://localhost:3000)!= "200" )); then exit 1; fi;
21+
- if (( $(curl -s -o /dev/null -w "%{http_code}" http://localhost:8001)!= "200" )); then exit 1; fi;
2122
- docker ps --format '{{.Image}}' | sort >> docker_up_output.txt
2223
- diff docker_up_output.txt test/image_names.txt
2324
notifications:

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ This is a [Docker Compose](https://docs.docker.com/compose/) configuration that
4040
- Chromedriver VNC at `localhost:5900` (use a standard VNC client to connect with password `secret`)
4141
- Narcissus screenshot service (container `narcissus`) at [http://localhost:8687](http://localhost:8687)
4242
- Fetch fact-checking service (container `fetch`) at [http://localhost:8687/about](http://localhost:8687/about)
43+
- Search v2 prototype application (container `search`) at [http://localhost:8001](http://localhost:8001)
4344

4445
## Testing
4546

@@ -73,6 +74,7 @@ This is a [Docker Compose](https://docs.docker.com/compose/) configuration that
7374
- [Fetch service](https://github.com/meedan/fetch)
7475
- [Check Slack bot](https://github.com/meedan/check-slack-bot)
7576
- [Check API bots](https://github.com/meedan/check-bots)
77+
- [Check Search v2 application](https://github.com/meedan/check-search)
7678

7779
## Upgrading databases in development environment
7880

check-search

Submodule check-search added at 21bdcaf

diagram.png

237 KB
Loading

diagram.svg

+177-65
Loading

docker-compose.yml

+15
Original file line numberDiff line numberDiff line change
@@ -259,3 +259,18 @@ services:
259259
- "/app/node_modules"
260260
networks:
261261
- dev
262+
search:
263+
build: check-search
264+
volumes:
265+
- "./check-search:/app"
266+
- "/app/node_modules"
267+
ports:
268+
- "8001:8001"
269+
depends_on:
270+
- api
271+
environment:
272+
NODE_ENV: development
273+
SERVER_PORT: 8001
274+
DEPLOY_ENV: development
275+
networks:
276+
- dev

docker-test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@ services:
5656
environment:
5757
NODE_ENV: development
5858
SERVER_PORT: 8687
59+
search:
60+
environment:
61+
NODE_ENV: development
62+
SERVER_PORT: 8001

test/image_names.txt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ check_mark
99
check_narcissus
1010
check_pender
1111
check_pender-background
12+
check_search
1213
check_web
1314
docker.elastic.co/kibana/kibana:7.9.2
1415
minio/minio

0 commit comments

Comments
 (0)