From 1f700eda21bfd76239fedc0c1aca49a2db84613a Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 20 Dec 2017 15:32:14 -0800 Subject: [PATCH 1/2] Fix typo in link Signed-off-by: Misty Stanley-Jones Upstream-commit: 946cb0d4fd703a083933d398529654628c1e62c5 Component: cli --- components/cli/docs/reference/commandline/login.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/docs/reference/commandline/login.md b/components/cli/docs/reference/commandline/login.md index 9d47ad3b9d..3ebeec3d41 100644 --- a/components/cli/docs/reference/commandline/login.md +++ b/components/cli/docs/reference/commandline/login.md @@ -60,7 +60,7 @@ $ cat ~/my_password.txt | docker login --username foo --password-stdin `docker login` requires user to use `sudo` or be `root`, except when: 1. connecting to a remote daemon, such as a `docker-machine` provisioned `docker engine`. -2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/security/security/#docker-daemon-attack-surface) for details. +2. user is added to the `docker` group. This will impact the security of your system; the `docker` group is `root` equivalent. See [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface) for details. You can log into any public or private repository for which you have credentials. When you log in, the command stores credentials in From 7fa76a7822c4eb0b107b3599d60adaecac44695d Mon Sep 17 00:00:00 2001 From: T K Sourabh Date: Thu, 21 Dec 2017 15:58:26 +0530 Subject: [PATCH 2/2] Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE The description for capabilities are mismatched for MAC_ADMIN and MAC_OVERRIDE. Signed-off-by: T K Sourabh Upstream-commit: afcc78aae356c287177b2ed71f3448258a323fbd Component: cli --- components/cli/docs/reference/run.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cli/docs/reference/run.md b/components/cli/docs/reference/run.md index 66bd878b19..b65504b62b 100644 --- a/components/cli/docs/reference/run.md +++ b/components/cli/docs/reference/run.md @@ -1198,8 +1198,8 @@ The next table shows the capabilities which are not granted by default and may b | SYS_TIME | Set system clock (settimeofday(2), stime(2), adjtimex(2)); set real-time (hardware) clock. | | SYS_TTY_CONFIG | Use vhangup(2); employ various privileged ioctl(2) operations on virtual terminals. | | AUDIT_CONTROL | Enable and disable kernel auditing; change auditing filter rules; retrieve auditing status and filtering rules. | -| MAC_OVERRIDE | Allow MAC configuration or state changes. Implemented for the Smack LSM. | -| MAC_ADMIN | Override Mandatory Access Control (MAC). Implemented for the Smack Linux Security Module (LSM). | +| MAC_ADMIN | Allow MAC configuration or state changes. Implemented for the Smack LSM. | +| MAC_OVERRIDE | Override Mandatory Access Control (MAC). Implemented for the Smack Linux Security Module (LSM). | | NET_ADMIN | Perform various network-related operations. | | SYSLOG | Perform privileged syslog(2) operations. | | DAC_READ_SEARCH | Bypass file read permission checks and directory read and execute permission checks. |