centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-02 17:28:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #351 from forkbomber/distribution-registry-nginx-reverse-proxy-avoid-second-api-version-header

Browse Source 
Registry: do not append second Docker-Distribution-Api-Version on Nginx reverse proxy
This commit is contained in:
Joao Fernandes
2016-12-13 10:42:35 -08:00
committed by GitHub
parent dd3d6a130a f8d4f8b5c5
commit 6e9605153d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
registry/recipes/nginx.md
View File

@@ -83,7 +83,7 @@ Create the main nginx configuration you will use.
```
cat <<EOF > auth/nginx.conf
cat > auth/nginx.conf << 'EOF'
events {
worker_connections 1024;
}
@@ -99,9 +99,8 @@ http {
## The registry always sets this header.
## In the case of nginx performing auth, the header will be unset
## since nginx is auth-ing before proxying.
map \$upstream_http_docker_distribution_api_version \$docker_distribution_api_version {
'registry/2.0' '';
default registry/2.0;
map $upstream_http_docker_distribution_api_version $docker_distribution_api_version {
'' 'registry/2.0';
}
server {
@@ -127,7 +126,7 @@ http {
location /v2/ {
# Do not allow connections from docker 1.5 and earlier
# docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents
if (\$http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*\$" ) {
if ($http_user_agent ~ "^(docker\/1\.(3|4|5(?!\.[0-9]-dev))|Go ).*$" ) {
return 404;
}
@@ -137,13 +136,13 @@ http {
## If $docker_distribution_api_version is empty, the header will not be added.
## See the map directive above where this variable is defined.
add_header 'Docker-Distribution-Api-Version' \$docker_distribution_api_version always;
add_header 'Docker-Distribution-Api-Version' $docker_distribution_api_version always;
proxy_pass http://docker-registry;
proxy_set_header Host \$http_host; # required for docker client's sake
proxy_set_header X-Real-IP \$remote_addr; # pass on real client's IP
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto \$scheme;
proxy_set_header Host $http_host; # required for docker client's sake
proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 900;
}
}