From 78d1794a2a69a77bb339edbdc35c9234fcc40898 Mon Sep 17 00:00:00 2001 From: Katrina Knight Date: Fri, 31 Mar 2023 22:40:24 +0100 Subject: [PATCH 1/6] docs: Move Post install ink to infobox Moved Post-Install link to inbobox to make it more visible. --- engine/install/ubuntu.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index c2aa4b01e3..44a07c86c9 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -180,11 +180,10 @@ Docker from the repository. This command downloads a test image and runs it in a container. When the container runs, it prints a confirmation message and exits. -You have now successfully installed and started Docker Engine. The `docker` user -group exists but contains no users, which is why you're required to use `sudo` -to run Docker commands. Continue to [Linux post-install](linux-postinstall.md) -to allow non-privileged users to run Docker commands and for other optional -configuration steps. +You have now successfully installed and started Docker Engine. +> The `docker` user group exists but contains no users, which is why you're required +> to use `sudo` to run Docker commands. Continue to [Linux post-install](linux-postinstall.md) +> to allow non-privileged users to run Docker commands and for other optional configuration steps. #### Upgrade Docker Engine From 332d95d5e138015e390ad44f8405df64581e4308 Mon Sep 17 00:00:00 2001 From: Katrina Knight Date: Fri, 31 Mar 2023 22:57:44 +0100 Subject: [PATCH 2/6] docs: Added title to infobox --- engine/install/ubuntu.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index 44a07c86c9..0ecef20921 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -181,6 +181,8 @@ Docker from the repository. container runs, it prints a confirmation message and exits. You have now successfully installed and started Docker Engine. +> Receiving errors when trying to run without root? +> > The `docker` user group exists but contains no users, which is why you're required > to use `sudo` to run Docker commands. Continue to [Linux post-install](linux-postinstall.md) > to allow non-privileged users to run Docker commands and for other optional configuration steps. From cbbd7c847ccc3b4e256925b5dc081c8f684a2334 Mon Sep 17 00:00:00 2001 From: Katrina Knight Date: Sat, 1 Apr 2023 00:02:33 +0100 Subject: [PATCH 3/6] Update engine/install/ubuntu.md Co-authored-by: Sebastiaan van Stijn --- engine/install/ubuntu.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index 0ecef20921..cb65b5dd11 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -180,7 +180,8 @@ Docker from the repository. This command downloads a test image and runs it in a container. When the container runs, it prints a confirmation message and exits. -You have now successfully installed and started Docker Engine. +You have now successfully installed and started Docker Engine. + > Receiving errors when trying to run without root? > > The `docker` user group exists but contains no users, which is why you're required From d2a801c0ab0f933dcac1821efe3cefb35a4c37d7 Mon Sep 17 00:00:00 2001 From: Katrina Knight Date: Sat, 1 Apr 2023 00:08:19 +0100 Subject: [PATCH 4/6] docs: Changed other docs to match --- engine/install/centos.md | 8 +++++++- engine/install/debian.md | 12 +++++++----- engine/install/fedora.md | 10 ++++++---- engine/install/rhel.md | 10 ++++++---- engine/install/sles.md | 10 ++++++---- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/engine/install/centos.md b/engine/install/centos.md index f77b709758..c9e09e5209 100644 --- a/engine/install/centos.md +++ b/engine/install/centos.md @@ -168,7 +168,13 @@ $ sudo yum-config-manager \ This command downloads a test image and runs it in a container. When the container runs, it prints a confirmation message and exits. -You have now successfully installed and started Docker Engine. The docker user group exists but contains no users, which is why you’re required to use sudo to run Docker commands. Continue to [Linux postinstall](linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. +You have now successfully installed and started Docker Engine. + +> Receiving errors when trying to run without root? +> +> The `docker` user group exists but contains no users, which is why you’re required +> to use `sudo` to run Docker commands. Continue to [Linux postinstall](linux-postinstall.md) +> to allow non-privileged users to run Docker commands and for other optional configuration steps. #### Upgrade Docker Engine diff --git a/engine/install/debian.md b/engine/install/debian.md index 088b8d86ea..5f807222e8 100644 --- a/engine/install/debian.md +++ b/engine/install/debian.md @@ -184,11 +184,13 @@ Raspbian. This command downloads a test image and runs it in a container. When the container runs, it prints a confirmation message and exits. -You have now successfully installed and started Docker Engine. The `docker` user -group exists but contains no users, which is why you're required to use `sudo` -to run Docker commands. Continue to [Linux post-install](linux-postinstall.md) -to allow non-privileged users to run Docker commands and for other optional -configuration steps. +You have now successfully installed and started Docker Engine. + +> Receiving errors when trying to run without root? +> +> The `docker` user group exists but contains no users, which is why you're required +> to use `sudo` to run Docker commands. Continue to [Linux post-install](linux-postinstall.md) +> to allow non-privileged users to run Docker commands and for other optional configuration steps. #### Upgrade Docker Engine diff --git a/engine/install/fedora.md b/engine/install/fedora.md index e6e4c12327..a083028e36 100644 --- a/engine/install/fedora.md +++ b/engine/install/fedora.md @@ -191,10 +191,12 @@ a new file each time you want to upgrade Docker Engine. This command downloads a test image and runs it in a container. When the container runs, it prints a message and exits. -This installs and runs Docker Engine. Use `sudo` to run Docker commands. -Continue to [Post-installation steps for Linux](linux-postinstall.md) to allow -non-privileged users to run Docker commands and for other optional configuration -steps. +This installs and runs Docker Engine. + +> Receiving errors when trying to run without root? +> +> Continue to [Linux post-install](linux-postinstall.md) to allow non-privileged users to run Docker commands +> and for other optional configuration steps. #### Upgrade Docker Engine diff --git a/engine/install/rhel.md b/engine/install/rhel.md index 8f6243f272..6096d39feb 100644 --- a/engine/install/rhel.md +++ b/engine/install/rhel.md @@ -155,10 +155,12 @@ $ sudo yum-config-manager \ This command downloads a test image and runs it in a container. When the container runs, it prints a message and exits. -This installs and runs Docker Engine. Use `sudo` to run Docker -commands. Continue to [Linux postinstall](linux-postinstall.md) to allow -non-privileged users to run Docker commands and for other optional configuration -steps. +This installs and runs Docker Engine. + +> Receiving errors when trying to run without root? +> +> Continue to [Linux post-install](linux-postinstall.md) to allow non-privileged users to run Docker commands +> and for other optional configuration steps. #### Upgrade Docker Engine diff --git a/engine/install/sles.md b/engine/install/sles.md index 77327e9093..d62432d41c 100644 --- a/engine/install/sles.md +++ b/engine/install/sles.md @@ -173,10 +173,12 @@ $ sudo zypper addrepo {{ download-url-base }}/docker-ce.repo This command downloads a test image and runs it in a container. When the container runs, it prints a message and exits. -This installs and runs Docker Engine. Use `sudo` to run Docker -commands. Continue to [Linux postinstall](linux-postinstall.md) to allow -non-privileged users to run Docker commands and for other optional configuration -steps. +This installs and runs Docker Engine. + +> Receiving errors when trying to run without root? +> +> Continue to [Linux post-install](linux-postinstall.md) to allow non-privileged users to run Docker commands +> and for other optional configuration steps. #### Upgrade Docker Engine From 1ee679125ef3e8ed7071d5f67519fa389c9f4792 Mon Sep 17 00:00:00 2001 From: Chris Chinchilla Date: Tue, 18 Apr 2023 16:25:34 +0200 Subject: [PATCH 5/6] Refactor to include and use call out formatting --- _includes/root-errors.md | 7 +++++++ engine/install/centos.md | 6 +----- engine/install/debian.md | 6 +----- engine/install/fedora.md | 5 +---- engine/install/rhel.md | 5 +---- engine/install/sles.md | 5 +---- 6 files changed, 12 insertions(+), 22 deletions(-) create mode 100644 _includes/root-errors.md diff --git a/_includes/root-errors.md b/_includes/root-errors.md new file mode 100644 index 0000000000..93f7b6cbf6 --- /dev/null +++ b/_includes/root-errors.md @@ -0,0 +1,7 @@ +> **Tip** +> +> Receiving errors when trying to run without root? +> +> The `docker` user group exists but contains no users, which is why you’re required +> to use `sudo` to run Docker commands. Continue to [Linux postinstall](linux-postinstall.md) +> to allow non-privileged users to run Docker commands and for other optional configuration steps. diff --git a/engine/install/centos.md b/engine/install/centos.md index c9e09e5209..57c8c0c313 100644 --- a/engine/install/centos.md +++ b/engine/install/centos.md @@ -170,11 +170,7 @@ $ sudo yum-config-manager \ You have now successfully installed and started Docker Engine. -> Receiving errors when trying to run without root? -> -> The `docker` user group exists but contains no users, which is why you’re required -> to use `sudo` to run Docker commands. Continue to [Linux postinstall](linux-postinstall.md) -> to allow non-privileged users to run Docker commands and for other optional configuration steps. +{% include root-errors.md %} #### Upgrade Docker Engine diff --git a/engine/install/debian.md b/engine/install/debian.md index 5f807222e8..2124f4ca00 100644 --- a/engine/install/debian.md +++ b/engine/install/debian.md @@ -186,11 +186,7 @@ Raspbian. You have now successfully installed and started Docker Engine. -> Receiving errors when trying to run without root? -> -> The `docker` user group exists but contains no users, which is why you're required -> to use `sudo` to run Docker commands. Continue to [Linux post-install](linux-postinstall.md) -> to allow non-privileged users to run Docker commands and for other optional configuration steps. +{% include root-errors.md %} #### Upgrade Docker Engine diff --git a/engine/install/fedora.md b/engine/install/fedora.md index a083028e36..bd81dea2ea 100644 --- a/engine/install/fedora.md +++ b/engine/install/fedora.md @@ -193,10 +193,7 @@ a new file each time you want to upgrade Docker Engine. This installs and runs Docker Engine. -> Receiving errors when trying to run without root? -> -> Continue to [Linux post-install](linux-postinstall.md) to allow non-privileged users to run Docker commands -> and for other optional configuration steps. +{% include root-errors.md %} #### Upgrade Docker Engine diff --git a/engine/install/rhel.md b/engine/install/rhel.md index 6096d39feb..96084383cc 100644 --- a/engine/install/rhel.md +++ b/engine/install/rhel.md @@ -157,10 +157,7 @@ $ sudo yum-config-manager \ This installs and runs Docker Engine. -> Receiving errors when trying to run without root? -> -> Continue to [Linux post-install](linux-postinstall.md) to allow non-privileged users to run Docker commands -> and for other optional configuration steps. +{% include root-errors.md %} #### Upgrade Docker Engine diff --git a/engine/install/sles.md b/engine/install/sles.md index d62432d41c..bebd29fba1 100644 --- a/engine/install/sles.md +++ b/engine/install/sles.md @@ -175,10 +175,7 @@ $ sudo zypper addrepo {{ download-url-base }}/docker-ce.repo This installs and runs Docker Engine. -> Receiving errors when trying to run without root? -> -> Continue to [Linux post-install](linux-postinstall.md) to allow non-privileged users to run Docker commands -> and for other optional configuration steps. +{% include root-errors.md %} #### Upgrade Docker Engine From d1fb9ebfbbf6035f5d630e6dcb0cc81862214a86 Mon Sep 17 00:00:00 2001 From: Chris Chinchilla Date: Tue, 18 Apr 2023 16:41:33 +0200 Subject: [PATCH 6/6] Correct link --- _includes/root-errors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/root-errors.md b/_includes/root-errors.md index 93f7b6cbf6..d37cb4084e 100644 --- a/_includes/root-errors.md +++ b/_includes/root-errors.md @@ -3,5 +3,6 @@ > Receiving errors when trying to run without root? > > The `docker` user group exists but contains no users, which is why you’re required -> to use `sudo` to run Docker commands. Continue to [Linux postinstall](linux-postinstall.md) +> to use `sudo` to run Docker commands. Continue to [Linux postinstall](/engine/install/linux-postinstall) > to allow non-privileged users to run Docker commands and for other optional configuration steps. +{: .tip} \ No newline at end of file