Skip to content

Close #110, Add nginx config for storage #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marchosiax merged 2 commits into from
Oct 19, 2021
Merged

Close #110, Add nginx config for storage #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995610d
Fix nginx config
ebrahimmfadae Oct 19, 2021
c0ea949
Add jenkins config
ebrahimmfadae Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Deployment/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ http {
upstream docker-api {
server api:8094;
}
upstream docker-storage {
server storage:8096;
}

proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
Expand Down Expand Up @@ -41,9 +44,14 @@ http {
rewrite ^/gateway(.*)$ $1 break;
}

location /storage {
proxy_pass http://docker-storage;
rewrite ^/storage/(.*)$ $1 break;
}

location /api {
proxy_pass http://docker-api;
rewrite ^/api(.*)$ $1 break;
}
}
}
}
4 changes: 4 additions & 0 deletions Jenkins/Jenkinsfile.deploy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ pipeline {
dir("BlockchainGateway") {
sh 'mvn -B clean install'
}

dir("Storage") {
sh 'mvn -B clean install'
}
}

}
Expand Down
2 changes: 1 addition & 1 deletion Storage/storage-app/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server.port: 8089
server.port: 8096

logging:
level:
Expand Down