Merge pull request #666 from docker/revert-661-add-authentication

Revert "Updates to authentication"
This commit is contained in:
Stephen Day 2015-06-26 14:22:26 -07:00
commit 3830c87469

View file

@ -30,11 +30,13 @@ Since the Docker engine uses basic authentication to negotiate access to the Reg
While this model gives you the ability to use whatever authentication backend you want through a secondary authentication mechanism implemented inside your proxy, it also requires that you move TLS termination from the Registry to the proxy itself. While this model gives you the ability to use whatever authentication backend you want through a secondary authentication mechanism implemented inside your proxy, it also requires that you move TLS termination from the Registry to the proxy itself.
Below is a simple example of secured basic authentication (using TLS), using nginx as a proxy. Below is a simple example of secured basic authentication (using TLS), using nginx as a proxy.
### Requirements ### Requirements
You should have followed entirely the basic [deployment guide](deploying.md). If you have not, please take the time to do so. You should have followed entirely the basic [deployment guide](deployement.md).
If you have not, please take the time to do so.
At this point, it's assumed that: At this point, it's assumed that:
@ -169,6 +171,6 @@ Now:
This is **advanced**. This is **advanced**.
You will find [background information here](/spec/auth/token.md), [configuration information here](configuration.md#auth). You will find [background information here](spec/auth/token.md), [configuration information here](configuration.md#auth).
Beware that you will have to implement your own authentication service for this to work (though there exist third-party open-source implementations). Beware that you will have to implement your own authentication service for this to work (though there exist third-party open-source implementations).