From 3823de5c50b7debce55038bb76891c57b49b5948 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn
Date: Tue, 29 Sep 2020 21:04:34 +0200
Subject: [PATCH] engine/security: move landing page
Generated yaml files were temporarily updated manually (pending
pull request to be merged in the upstream docker/cli repository)
Signed-off-by: Sebastiaan van Stijn
---
_data/engine-cli/docker_login.yaml | 2 +-
_data/toc.yaml | 2 +-
_includes/body-landing.html | 2 +-
_includes/install-script.md | 2 +-
engine/install/linux-postinstall.md | 2 +-
engine/security/{security.md => index.md} | 1 +
6 files changed, 6 insertions(+), 5 deletions(-)
rename engine/security/{security.md => index.md} (99%)
diff --git a/_data/engine-cli/docker_login.yaml b/_data/engine-cli/docker_login.yaml
index de6bb09f53..b486de1a0b 100644
--- a/_data/engine-cli/docker_login.yaml
+++ b/_data/engine-cli/docker_login.yaml
@@ -61,7 +61,7 @@ examples: |-
`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/engine/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/#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
diff --git a/_data/toc.yaml b/_data/toc.yaml
index 02cf7d6a23..49831fde66 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -143,7 +143,7 @@ guides:
title: Splunk logging driver
- sectiontitle: Security
section:
- - path: /engine/security/security/
+ - path: /engine/security/
title: Docker security
- path: /engine/security/non-events/
title: Docker security non-events
diff --git a/_includes/body-landing.html b/_includes/body-landing.html
index ecc8805499..050ca4da33 100644
--- a/_includes/body-landing.html
+++ b/_includes/body-landing.html
@@ -595,7 +595,7 @@
-
+
Docker Security best practices
diff --git a/_includes/install-script.md b/_includes/install-script.md
index 9185444725..5f7659e434 100644
--- a/_includes/install-script.md
+++ b/_includes/install-script.md
@@ -57,7 +57,7 @@ Remember to log out and back in for this to take effect!
>
> Adding a user to the "docker" group grants them the ability to run containers
> which can be used to obtain root privileges on the Docker host. Refer to
-> [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface)
+> [Docker Daemon Attack Surface](/engine/security/#docker-daemon-attack-surface)
> for more information.
{:.warning}
diff --git a/engine/install/linux-postinstall.md b/engine/install/linux-postinstall.md
index 7c972884ca..5159ee532f 100644
--- a/engine/install/linux-postinstall.md
+++ b/engine/install/linux-postinstall.md
@@ -25,7 +25,7 @@ creates a Unix socket accessible by members of the `docker` group.
>
> The `docker` group grants privileges equivalent to the `root`
> user. For details on how this impacts security in your system, see
-> [*Docker Daemon Attack Surface*](../security/security.md#docker-daemon-attack-surface).
+> [*Docker Daemon Attack Surface*](../security/index.md#docker-daemon-attack-surface).
{: .warning}
> **Note**:
diff --git a/engine/security/security.md b/engine/security/index.md
similarity index 99%
rename from engine/security/security.md
rename to engine/security/index.md
index 4c0c80ce1c..138513466f 100644
--- a/engine/security/security.md
+++ b/engine/security/index.md
@@ -4,6 +4,7 @@ keywords: Docker, Docker documentation, security
redirect_from:
- /articles/security/
- /engine/articles/security/
+- /engine/security/security/
- /security/security/
title: Docker security
---