toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21232 from calavera/consolidate_security_opts_format

Browse Source 
Consolidate security options to use `=` as separator.
Upstream-commit: 06e98f0a5cf59c040e9f753d60f33ba22256d55c
Component: engine
This commit is contained in:
Jess Frazelle
2016-03-18 16:02:38 -07:00
parent 60ab5793ac cb854bf11c
commit ef4d935247
11 changed files with 120 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/docs/security/apparmor.md
View File

@ -69,7 +69,7 @@ override it with the `security-opt` option. For example, the following
explicitly specifies the default policy:
```bash
$ docker run --rm -it --security-opt apparmor:docker-default hello-world
$ docker run --rm -it --security-opt apparmor=docker-default hello-world
```
## Loading and Unloading Profiles
@ -83,7 +83,7 @@ $ apparmor_parser -r -W /path/to/your_profile
Then you can run the custom profile with `--security-opt` like so:
```bash
$ docker run --rm -it --security-opt apparmor:your_profile hello-world
$ docker run --rm -it --security-opt apparmor=your_profile hello-world
```
To unload a profile from AppArmor:

4
components/engine/docs/security/seccomp.md
View File

@ -66,7 +66,7 @@ it with the `security-opt` option. For example, the following explicitly
specifies the default policy:
```
$ docker run --rm -it --security-opt seccomp:/path/to/seccomp/profile.json hello-world
$ docker run --rm -it --security-opt seccomp=/path/to/seccomp/profile.json hello-world
```
### Significant syscalls blocked by the default profile
@ -138,6 +138,6 @@ You can pass `unconfined` to run a container without the default seccomp
profile.
```
$ docker run --rm -it --security-opt seccomp:unconfined debian:jessie \
$ docker run --rm -it --security-opt seccomp=unconfined debian:jessie \
unshare --map-root-user --user sh -c whoami
```