Skip to content

Commit a24c99a

Browse files
committed
[GH-22] Add validation service
1 parent b4dc247 commit a24c99a

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

docker-compose.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
volumes:
2626
- termit-db-server:/opt/graphdb/home
2727
termit-server:
28-
image: kbsscvut/termit:dev
28+
image: kbsscvut/termit
2929
depends_on:
3030
- termit-db-server
3131
environment:
@@ -44,15 +44,22 @@ services:
4444
TERMIT_SERVER_SERVLET_CONTEXT-PATH: ${ROOT}/sluzby/server
4545
TERMIT_FILE_STORAGE: /tmp/storage
4646
TERMIT_TEXTANALYSIS_URL: http://annotace-server:8080/annotate?enableKeywordExtraction=true
47+
TERMIT_VALIDATIONSERVICEURL: http://validation-service:8080/validate
4748
TERMIT_JWT_SECRETKEY: ${JWT_SECRET_KEY}
4849
volumes:
4950
- termit-server:/tmp/storage
5051
annotace-server:
5152
image: ghcr.io/kbss-cvut/annotace/annotace-spark:latest
5253
volumes:
5354
- annotace-server:/tmp
55+
validation-service:
56+
image: ghcr.io/kbss-cvut/validation-service/validation-service:latest
57+
depends_on:
58+
- termit-db-server
59+
environment:
60+
VALIDATOR_REPOSITORYURL: http://termit-db-server:7200/repositories/termit
5461
termit:
55-
image: kbsscvut/termit-ui:dev
62+
image: kbsscvut/termit-ui
5663
depends_on:
5764
- termit-server
5865
environment:

nginx/nginx.conf

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ http {
2626
}
2727

2828
location ${ROOT}/sluzby/db-server/ {
29-
proxy_pass http://termit-db-server:7200/;
29+
proxy_pass http://termit-db-server:7200/;
3030
}
3131

3232
location = ${ROOT}/sluzby/server {
33-
return 302 ${ORIGIN}${ROOT}/sluzby/server/;
33+
return 302 ${ORIGIN}${ROOT}/sluzby/server/;
3434
}
3535

3636
location ${ROOT}/sluzby/server/ {
@@ -43,6 +43,20 @@ http {
4343
proxy_set_header Connection $connection_upgrade;
4444
}
4545

46+
location = ${ROOT}/sluzby/validace {
47+
return 302 ${ORIGIN}${ROOT}/sluzby/validace/;
48+
}
49+
50+
location ${ROOT}/sluzby/validace/ {
51+
proxy_pass http://validation-service:8080/;
52+
proxy_set_header X-Forwarded-Host $host;
53+
proxy_set_header X-Forwarded-Prefix ${ROOT}/sluzby/validace/;
54+
proxy_set_header X-Forwarded-Port ${PORT};
55+
56+
proxy_http_version 1.1;
57+
proxy_set_header "Connection" "";
58+
}
59+
4660
location = ${ROOT} {
4761
return 302 ${ORIGIN}${ROOT}/;
4862
}

0 commit comments

Comments
 (0)