vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bagger'

Browse source
This commit is contained in:
Joseph Schorr 2014-12-01 12:48:59 -05:00
commit 72d613614d
36 changed files with 1123 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
conf/server-base.conf
View file

@ -60,3 +60,15 @@ location /v1/_ping {
add_header X-Docker-Registry-Standalone 0;
return 200 'true';
}
location ~ ^/b1/controller(/?)(.*) {
proxy_pass http://build_manager_controller_server/$2;
proxy_read_timeout 2000;
}
location ~ ^/b1/socket(/?)(.*) {
proxy_pass http://build_manager_websocket_server/$2;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}