Skip to content

Commit

Permalink
names fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lamba92 committed Jun 7, 2020
1 parent c6a1a65 commit c4bce43
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 27 deletions.
36 changes: 17 additions & 19 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:
networks:
- mongo-net
depends_on:
- mongo-supervisor
- supervisor
deploy:
restart_policy:
condition: on-failure
Expand All @@ -80,11 +80,11 @@ services:
window: 15s
mode: global
environment:
- MONGO_URL=mongodb://mongo-supervisor:27017
- MONGO_URL=mongodb://supervisor:27017
- MONGO_DB_NAME=maadb

maadb-supervisor:
image: lamba92/maadb-project-maadb-supervisor
supervisor:
image: lamba92/maadb-project-supervisor
networks:
- mongo-net
- postgres-net
Expand Down Expand Up @@ -200,21 +200,19 @@ services:
max_attempts: 5
window: 10s

mongo-express:
image: mongo-express
networks:
- mongo-net
depends_on:
- mongo-supervisor
deploy:
restart_policy:
delay: 20s
max_attempts: 5
window: 20s
environment:
- ME_CONFIG_MONGODB_ADMINUSERNAME=admin
- ME_CONFIG_MONGODB_ADMINPASSWORD=password
- ME_CONFIG_MONGODB_SERVER=mongo-supervisor
# mongo-ui:
# image: huggingface/mongoku
# networks:
# - mongo-net
# depends_on:
# - supervisor
# deploy:
# restart_policy:
# delay: 20s
# max_attempts: 5
# window: 20s
# environment:
# - MONGOKU_DEFAULT_HOST=mongodb://supervisor:27017

api-gateway:
image: nginx
Expand Down
7 changes: 0 additions & 7 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ http {
location /sql/ {
proxy_pass http://sql-analytics-server/;
}
location /nosql/ui/ {
proxy_pass http://mongo-express:8081/;
proxy_http_version 1.1;
proxy_set_header X-Forwarded-Host $host: $server_port;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location /nosql/ {
proxy_pass http://nosql-analytics-server/;
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include(
":core",
":sql",
":nosql",
":maadb-supervisor",
":supervisor",
":analytics-server-core",
":sql-analytics-server",
":nosql-analytics-server",
Expand Down
File renamed without changes.

0 comments on commit c4bce43

Please sign in to comment.