Skip to content

Commit

Permalink
fix(static): UI does not send requests to registry under non-root url (
Browse files Browse the repository at this point in the history
…#73)

Add example for this issue
fixes: #73
  • Loading branch information
Joxit committed Mar 21, 2019
1 parent df508cd commit f1bff47
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dist/scripts/docker-registry-ui-static.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/scripts/docker-registry-ui.js

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions examples/issue-73/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: '2.0'
services:
registry:
image: registry:2.6.2
volumes:
- ./registry-data:/var/lib/registry
networks:
- registry-ui-net

ui:
image: joxit/docker-registry-ui:static
environment:
- REGISTRY_TITLE=My Private Docker Registry
- REGISTRY_URL=http://registry:5000
depends_on:
- registry
networks:
- registry-ui-net

proxy:
image: nginx:alpine
volumes:
- ./nginx.conf:/etc/nginx/conf.d/default.conf
ports:
- 80:80
depends_on:
- ui
networks:
- registry-ui-net
networks:
registry-ui-net:
35 changes: 35 additions & 0 deletions examples/issue-73/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
server {
listen 80;
server_name localhost;
resolver 127.0.0.11; # This is for docker container name resolver
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;

# disable any limits to avoid HTTP 413 for large image uploads
client_max_body_size 0;

# required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486)
chunked_transfer_encoding on;
# required for strict SNI checking: see Issue #70 (https://github.com/Joxit/docker-registry-ui/issues/70)
proxy_ssl_server_name on;

location /ui/ {
proxy_pass http://ui/;
}

#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;
}

# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docker-registry-ui",
"version": "1.1.0",
"version": "1.1.1",
"scripts": {
"build": "./node_modules/gulp/bin/gulp.js build"
},
Expand Down
7 changes: 6 additions & 1 deletion src/scripts/static.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@
*/
var registryUI = {}
registryUI.url = function() {
return '${URL}';
var url = '${URL}';
if (!url) {
url = window.location.origin + window.location.pathname;
return url.endsWith('/') ? url.substr(0, url.length - 1) : url;
}
return url;
};
registryUI.name = function() {
return '${REGISTRY_TITLE}' || registryUI.url();
Expand Down

0 comments on commit f1bff47

Please sign in to comment.