From 2a97eae6980da2c56fd7ff14cf297b7038796bba Mon Sep 17 00:00:00 2001 From: Nuno do Carmo Date: Mon, 15 Nov 2021 16:06:06 +0100 Subject: [PATCH 1/6] Closes #3662 --- .../single-node-docker/_index.md | 19 +++++++++++++++++++ .../single-node-docker/_index.md | 19 +++++++++++++++++++ .../single-node-docker/_index.md | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md index 22dab597f2d..a84b04a70d6 100644 --- a/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md @@ -44,6 +44,7 @@ Choose from the following options: - [Option B: Bring Your Own Certificate, Self-signed](#option-b-bring-your-own-certificate-self-signed) - [Option C: Bring Your Own Certificate, Signed by a Recognized CA](#option-c-bring-your-own-certificate-signed-by-a-recognized-ca) - [Option D: Let's Encrypt Certificate](#option-d-let-s-encrypt-certificate) +- [Option E: Localhost tunneling, no Certificate](#option-e-localhost-tunneling-no-certificate) ### Option A: Default Rancher-generated Self-signed Certificate @@ -140,6 +141,24 @@ docker run -d --restart=unless-stopped \ --acme-domain ``` +### Option E: Localhost tunneling, no Certificate + +If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running (i.e. [ngrok](https://ngrok.com/)), you'll need to avoid generating a Certificate. This installation option doesn't request for a certificate. + +Log into your host machine, and run the Docker command below. + +- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. + +Privileged access is [required.](#privileged-access-for-rancher) + +```bash +docker run -d --restart=unless-stopped \ + -p 80:80 -p 443:443 \ + --privileged \ + rancher/rancher:latest \ + --no-cacerts +``` + ## Advanced Options When installing Rancher on a single node with Docker, there are several advanced options that can be enabled: diff --git a/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md index d28ce130fb3..0b860d9d693 100644 --- a/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md @@ -50,6 +50,7 @@ Choose from the following options: - [Option B: Bring Your Own Certificate, Self-signed](#option-b-bring-your-own-certificate-self-signed) - [Option C: Bring Your Own Certificate, Signed by a Recognized CA](#option-c-bring-your-own-certificate-signed-by-a-recognized-ca) - [Option D: Let's Encrypt Certificate](#option-d-let-s-encrypt-certificate) +- [Option E: Localhost tunneling, no Certificate](#option-e-localhost-tunneling-no-certificate) ### Option A: Default Rancher-generated Self-signed Certificate @@ -156,6 +157,24 @@ docker run -d --restart=unless-stopped \ --acme-domain ``` +### Option E: Localhost tunneling, no Certificate + +If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running (i.e. [ngrok](https://ngrok.com/)), you'll need to avoid generating a Certificate. This installation option doesn't request for a certificate. + +Log into your host machine, and run the Docker command below. + +- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. + +Privileged access is [required.](#privileged-access-for-rancher) + +```bash +docker run -d --restart=unless-stopped \ + -p 80:80 -p 443:443 \ + --privileged \ + rancher/rancher:latest \ + --no-cacerts +``` + ## Advanced Options When installing Rancher on a single node with Docker, there are several advanced options that can be enabled: diff --git a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md index c047052f024..357069dd0fc 100644 --- a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md @@ -44,6 +44,7 @@ Choose from the following options: - [Option B: Bring Your Own Certificate, Self-signed](#option-b-bring-your-own-certificate-self-signed) - [Option C: Bring Your Own Certificate, Signed by a Recognized CA](#option-c-bring-your-own-certificate-signed-by-a-recognized-ca) - [Option D: Let's Encrypt Certificate](#option-d-let-s-encrypt-certificate) +- [Option E: Localhost tunneling, no Certificate](#option-e-localhost-tunneling-no-certificate) ### Option A: Default Rancher-generated Self-signed Certificate @@ -150,6 +151,24 @@ docker run -d --restart=unless-stopped \ --acme-domain ``` +### Option E: Localhost tunneling, no Certificate + +If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running (i.e. [ngrok](https://ngrok.com/)), you'll need to avoid generating a Certificate. This installation option doesn't request for a certificate. + +Log into your host machine, and run the Docker command below. + +- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. + +Privileged access is [required.](#privileged-access-for-rancher) + +```bash +docker run -d --restart=unless-stopped \ + -p 80:80 -p 443:443 \ + --privileged \ + rancher/rancher:latest \ + --no-cacerts +``` + ## Advanced Options When installing Rancher on a single node with Docker, there are several advanced options that can be enabled: From 69a3d6743c5b2094cd7130541cc48668d4fe37f7 Mon Sep 17 00:00:00 2001 From: Nuno do Carmo Date: Mon, 15 Nov 2021 16:54:37 +0100 Subject: [PATCH 2/6] Removed option E from v2.5 and v2.0-4 --- .../single-node-docker/_index.md | 19 ------------------- .../single-node-docker/_index.md | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md index a84b04a70d6..22dab597f2d 100644 --- a/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/_index.md @@ -44,7 +44,6 @@ Choose from the following options: - [Option B: Bring Your Own Certificate, Self-signed](#option-b-bring-your-own-certificate-self-signed) - [Option C: Bring Your Own Certificate, Signed by a Recognized CA](#option-c-bring-your-own-certificate-signed-by-a-recognized-ca) - [Option D: Let's Encrypt Certificate](#option-d-let-s-encrypt-certificate) -- [Option E: Localhost tunneling, no Certificate](#option-e-localhost-tunneling-no-certificate) ### Option A: Default Rancher-generated Self-signed Certificate @@ -141,24 +140,6 @@ docker run -d --restart=unless-stopped \ --acme-domain ``` -### Option E: Localhost tunneling, no Certificate - -If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running (i.e. [ngrok](https://ngrok.com/)), you'll need to avoid generating a Certificate. This installation option doesn't request for a certificate. - -Log into your host machine, and run the Docker command below. - -- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. - -Privileged access is [required.](#privileged-access-for-rancher) - -```bash -docker run -d --restart=unless-stopped \ - -p 80:80 -p 443:443 \ - --privileged \ - rancher/rancher:latest \ - --no-cacerts -``` - ## Advanced Options When installing Rancher on a single node with Docker, there are several advanced options that can be enabled: diff --git a/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md index 0b860d9d693..d28ce130fb3 100644 --- a/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.5/en/installation/other-installation-methods/single-node-docker/_index.md @@ -50,7 +50,6 @@ Choose from the following options: - [Option B: Bring Your Own Certificate, Self-signed](#option-b-bring-your-own-certificate-self-signed) - [Option C: Bring Your Own Certificate, Signed by a Recognized CA](#option-c-bring-your-own-certificate-signed-by-a-recognized-ca) - [Option D: Let's Encrypt Certificate](#option-d-let-s-encrypt-certificate) -- [Option E: Localhost tunneling, no Certificate](#option-e-localhost-tunneling-no-certificate) ### Option A: Default Rancher-generated Self-signed Certificate @@ -157,24 +156,6 @@ docker run -d --restart=unless-stopped \ --acme-domain ``` -### Option E: Localhost tunneling, no Certificate - -If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running (i.e. [ngrok](https://ngrok.com/)), you'll need to avoid generating a Certificate. This installation option doesn't request for a certificate. - -Log into your host machine, and run the Docker command below. - -- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. - -Privileged access is [required.](#privileged-access-for-rancher) - -```bash -docker run -d --restart=unless-stopped \ - -p 80:80 -p 443:443 \ - --privileged \ - rancher/rancher:latest \ - --no-cacerts -``` - ## Advanced Options When installing Rancher on a single node with Docker, there are several advanced options that can be enabled: From 855ec3b4d1710cd401d6c1c4832951e323b9470d Mon Sep 17 00:00:00 2001 From: Nuno do Carmo Date: Mon, 15 Nov 2021 18:44:56 +0100 Subject: [PATCH 3/6] Option E description updated Co-authored-by: Jen Travinski --- .../other-installation-methods/single-node-docker/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md index 357069dd0fc..86cbdb3409f 100644 --- a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md @@ -153,7 +153,7 @@ docker run -d --restart=unless-stopped \ ### Option E: Localhost tunneling, no Certificate -If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running (i.e. [ngrok](https://ngrok.com/)), you'll need to avoid generating a Certificate. This installation option doesn't request for a certificate. +If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running, such as [ngrok](https://ngrok.com/), avoid generating a certificate. This installation option doesn't require a certificate. Log into your host machine, and run the Docker command below. From a1381ebcb2bf1e42c895eac22701cd1927cd71cf Mon Sep 17 00:00:00 2001 From: Nuno do Carmo Date: Mon, 15 Nov 2021 18:48:17 +0100 Subject: [PATCH 4/6] Moved the directions for better context Co-authored-by: Jen Travinski --- .../other-installation-methods/single-node-docker/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md index 86cbdb3409f..4bf7f123324 100644 --- a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md @@ -155,7 +155,9 @@ docker run -d --restart=unless-stopped \ If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running, such as [ngrok](https://ngrok.com/), avoid generating a certificate. This installation option doesn't require a certificate. -Log into your host machine, and run the Docker command below. +- You will use `--no-cacerts` in the argument to disable the default CA certificate generated by Rancher. Note that privileged access is [required.](#privileged-access-for-rancher). + +Log into your host machine and run the Docker command below: - Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. From 5c240e81b0323f329ef93e4a5bb338213de2a746 Mon Sep 17 00:00:00 2001 From: Nuno do Carmo Date: Wed, 17 Nov 2021 09:22:02 +0100 Subject: [PATCH 5/6] Removed `--privileged` references and added command As suggested, the `--privileged` reference was removed from every options and only the description, at the top, remains. In every options, the command's introduction has been rephrased to be more generic. --- .../single-node-docker/_index.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md index 4bf7f123324..35b6cb9a5a7 100644 --- a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md @@ -50,9 +50,7 @@ Choose from the following options: If you are installing Rancher in a development or testing environment where identity verification isn't a concern, install Rancher using the self-signed certificate that it generates. This installation option omits the hassle of generating a certificate yourself. -Log into your Linux host, and then run the minimum installation command below. - -Privileged access is [required.](#privileged-access-for-rancher) +Log into your host, and run the command below: ```bash docker run -d --restart=unless-stopped \ @@ -79,7 +77,7 @@ After creating your certificate, run the Docker command below to install Rancher | `` | The path to the private key for your certificate. | | `` | The path to the certificate authority's certificate. | -Privileged access is [required.](#privileged-access-for-rancher) +Log into your host, and run the command below: ```bash docker run -d --restart=unless-stopped \ @@ -111,7 +109,7 @@ After obtaining your certificate, run the Docker command below. | `` | The path to your full certificate chain. | | `` | The path to the private key for your certificate. | -Privileged access is [required.](#privileged-access-for-rancher) +Log into your host, and run the command below: ```bash docker run -d --restart=unless-stopped \ @@ -141,7 +139,7 @@ After you fulfill the prerequisites, you can install Rancher using a Let's Encry | ----------------- | ------------------- | | `` | Your domain address | -Privileged access is [required.](#privileged-access-for-rancher) +Log into your host, and run the command below: ``` docker run -d --restart=unless-stopped \ @@ -155,13 +153,9 @@ docker run -d --restart=unless-stopped \ If you are installing Rancher in a development or testing environment where you have a localhost tunneling solution running, such as [ngrok](https://ngrok.com/), avoid generating a certificate. This installation option doesn't require a certificate. -- You will use `--no-cacerts` in the argument to disable the default CA certificate generated by Rancher. Note that privileged access is [required.](#privileged-access-for-rancher). +- You will use `--no-cacerts` in the argument to disable the default CA certificate generated by Rancher. -Log into your host machine and run the Docker command below: - -- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher. - -Privileged access is [required.](#privileged-access-for-rancher) +Log into your host, and run the command below:: ```bash docker run -d --restart=unless-stopped \ From 12d8031495a194d834ddbec8bfedf0fad50aa33a Mon Sep 17 00:00:00 2001 From: Nuno do Carmo Date: Thu, 18 Nov 2021 09:08:07 +0100 Subject: [PATCH 6/6] Removed trailing ":" Co-authored-by: Jen Travinski --- .../other-installation-methods/single-node-docker/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md index 35b6cb9a5a7..26ba9770630 100644 --- a/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md +++ b/content/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/_index.md @@ -155,7 +155,7 @@ If you are installing Rancher in a development or testing environment where you - You will use `--no-cacerts` in the argument to disable the default CA certificate generated by Rancher. -Log into your host, and run the command below:: +Log into your host, and run the command below: ```bash docker run -d --restart=unless-stopped \