Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename authz to authorization for greater clarity 

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2016-01-12 19:38:18 -05:00
parent 3f5817fdae
commit 7f6a7ed8d1
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/completion/bash/docker
View File

@ -685,7 +685,7 @@ _docker_daemon() {
local options_with_args=" local options_with_args="
$global_options_with_args $global_options_with_args
--api-cors-header --api-cors-header
--authz-plugin --authorization-plugin
--bip --bip
--bridge -b --bridge -b
--cgroup-parent --cgroup-parent
@ -717,7 +717,7 @@ _docker_daemon() {
" "
case "$prev" in case "$prev" in
--authz-plugin) --authorization-plugin)
__docker_complete_plugins Authorization __docker_complete_plugins Authorization
return return
;; ;;

2
contrib/completion/zsh/_docker
View File

@ -590,7 +590,7 @@ __docker_subcommand() {
_arguments $(__docker_arguments) \ _arguments $(__docker_arguments) \
$opts_help \ $opts_help \
"($help)--api-cors-header=[Set CORS headers in the remote API]:CORS headers: " \ "($help)--api-cors-header=[Set CORS headers in the remote API]:CORS headers: " \
"($help)*--authz-plugin=[Set authorization plugins to load]" \ "($help)*--authorization-plugin=[Set authorization plugins to load]" \
"($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \ "($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
"($help)--bip=[Specify network bridge IP]" \ "($help)--bip=[Specify network bridge IP]" \
"($help)--cgroup-parent=[Set parent cgroup for all containers]:cgroup: " \ "($help)--cgroup-parent=[Set parent cgroup for all containers]:cgroup: " \

13
docs/extend/authorization.md
View File

@ -12,7 +12,7 @@ weight = -1
# Create an authorization plugin # Create an authorization plugin
Docker’s out-of-the-box authorization model is all or nothing. Any user with Docker's out-of-the-box authorization model is all or nothing. Any user with
permission to access the Docker daemon can run any Docker client command. The permission to access the Docker daemon can run any Docker client command. The
same is true for callers using Docker's remote API to contact the daemon. If you same is true for callers using Docker's remote API to contact the daemon. If you
require greater access control, you can create authorization plugins and add require greater access control, you can create authorization plugins and add
@ -45,6 +45,9 @@ Authorization plugins must follow the rules described in [Docker Plugin API](plu
Each plugin must reside within directories described under the Each plugin must reside within directories described under the
[Plugin discovery](plugin_api.md#plugin-discovery) section. [Plugin discovery](plugin_api.md#plugin-discovery) section.
**Note**: the abbreviations `AuthZ` and `AuthN` mean authorization and authentication
respectively.
## Basic architecture ## Basic architecture
You are responsible for registering your plugin as part of the Docker daemon You are responsible for registering your plugin as part of the Docker daemon
@ -93,14 +96,14 @@ support the Docker client interactions detailed in this section.
### Setting up Docker daemon ### Setting up Docker daemon
Enable the authorization plugin with a dedicated command line flag in the Enable the authorization plugin with a dedicated command line flag in the
`--authz-plugin=PLUGIN_ID` format. The flag supplies a `PLUGIN_ID` value. `--authorization-plugin=PLUGIN_ID` format. The flag supplies a `PLUGIN_ID`
This value can be the plugin’s socket or a path to a specification file. value. This value can be the plugin’s socket or a path to a specification file.
```bash ```bash
$ docker daemon --authz-plugin=plugin1 --authz-plugin=plugin2,... $ docker daemon --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
``` ```
Docker's authorization subsystem supports multiple `--authz-plugin` parameters. Docker's authorization subsystem supports multiple `--authorization-plugin` parameters.
### Calling authorized command (allow) ### Calling authorized command (allow)

6
docs/reference/commandline/daemon.md
View File

@ -17,7 +17,7 @@ weight = -1
Options: Options:
--api-cors-header="" Set CORS headers in the remote API --api-cors-header="" Set CORS headers in the remote API
--authz-plugin=[] Set authorization plugins to load --authorization-plugin=[] Set authorization plugins to load
-b, --bridge="" Attach containers to a network bridge -b, --bridge="" Attach containers to a network bridge
--bip="" Specify network bridge IP --bip="" Specify network bridge IP
--cgroup-parent= Set parent cgroup for all containers --cgroup-parent= Set parent cgroup for all containers
@ -613,10 +613,10 @@ The currently supported cluster store options are:
Docker's access authorization can be extended by authorization plugins that your Docker's access authorization can be extended by authorization plugins that your
organization can purchase or build themselves. You can install one or more organization can purchase or build themselves. You can install one or more
authorization plugins when you start the Docker `daemon` using the authorization plugins when you start the Docker `daemon` using the
`--authz-plugin=PLUGIN_ID` option. `--authorization-plugin=PLUGIN_ID` option.
```bash ```bash
docker daemon --authz-plugin=plugin1 --authz-plugin=plugin2,... docker daemon --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
``` ```
The `PLUGIN_ID` value is either the plugin's name or a path to its specification The `PLUGIN_ID` value is either the plugin's name or a path to its specification

8
man/docker-daemon.8.md
View File

@ -7,7 +7,7 @@ docker-daemon - Enable daemon mode
# SYNOPSIS # SYNOPSIS
**docker daemon** **docker daemon**
[**--api-cors-header**=[=*API-CORS-HEADER*]] [**--api-cors-header**=[=*API-CORS-HEADER*]]
[**--authz-plugin**[=*[]*]] [**--authorization-plugin**[=*[]*]]
[**-b**|**--bridge**[=*BRIDGE*]] [**-b**|**--bridge**[=*BRIDGE*]]
[**--bip**[=*BIP*]] [**--bip**[=*BIP*]]
[**--cgroup-parent**[=*[]*]] [**--cgroup-parent**[=*[]*]]
@ -73,7 +73,7 @@ format.
**--api-cors-header**="" **--api-cors-header**=""
Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all. Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all.
**--authz-plugin**="" **--authorization-plugin**=""
Set authorization plugins to load Set authorization plugins to load
**-b**, **--bridge**="" **-b**, **--bridge**=""
@ -473,10 +473,10 @@ Key/Value store.
Docker's access authorization can be extended by authorization plugins that your Docker's access authorization can be extended by authorization plugins that your
organization can purchase or build themselves. You can install one or more organization can purchase or build themselves. You can install one or more
authorization plugins when you start the Docker `daemon` using the authorization plugins when you start the Docker `daemon` using the
`--authz-plugin=PLUGIN_ID` option. `--authorization-plugin=PLUGIN_ID` option.
```bash ```bash
docker daemon --authz-plugin=plugin1 --authz-plugin=plugin2,... docker daemon --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
``` ```
The `PLUGIN_ID` value is either the plugin's name or a path to its specification The `PLUGIN_ID` value is either the plugin's name or a path to its specification