Skip to content
This repository has been archived by the owner on Nov 20, 2020. It is now read-only.

Commit

Permalink
web console
Browse files Browse the repository at this point in the history
  • Loading branch information
francescou committed Aug 14, 2017
1 parent 35d1503 commit 904d029
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
33 changes: 33 additions & 0 deletions default.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
server {
listen 80;
server_name localhost;

access_log /logs/host.access.log main;

location / {
proxy_pass http://docker_compose_ui:5000;
}

location /web-console/ {
proxy_pass http://web_console:8888;
}

location /web-console/exec {
proxy_pass http://web_console:8888;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}


#error_page 404 /404.html;

# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}

}

2 changes: 1 addition & 1 deletion static/views/project-detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h4 class="modal-title">{{containerLogs}} logs</h4>
<h4 class="modal-title">{{containerName}} console</h4>
</div>
<div class="modal-body">
<iframe ng-if="containerConsoleUrl" src="{{containerConsoleUrl}}" style="width: 800px; height: 450px; border: none;"></iframe>
<iframe ng-if="containerConsoleUrl" src="{{containerConsoleUrl}}" style="width: 810px; height: 460px; border: none;"></iframe>
</div>
<div class="modal-footer">
</div>
Expand Down

0 comments on commit 904d029

Please sign in to comment.