From 215f6d97e5e3fc7e4451b0cc20ec73631e28243e Mon Sep 17 00:00:00 2001 From: Jay Pfaffman Date: Tue, 17 Sep 2019 12:45:40 -0700 Subject: [PATCH] Make INSTALL-cloud agree with discourse-setup (#8102) `discourse-setup` will install Docker. Several people lately have had trouble with a `|` getting turned into a `>` when trying to `curl` the site into `sh`. Also, the recommended `git clone` command will create `/var/discourse`, so don't tell people to make that directory, as that too can be confusing. --- docs/INSTALL-cloud.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index f7fb134a4d4..ede6f1f0151 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -26,15 +26,13 @@ Enter the root password from the email DigitalOcean sent you when the server was -### Install Docker / Git +### Install Docker / Git (Optional) - wget -qO- https://get.docker.com/ | sh - -This command installs the latest versions of Docker and Git on your server. Alternately, you can manually [install Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) and the [Docker package for your OS](https://docs.docker.com/installation/). +If you have reason to install your own version of Docker, you may do so. If docker is not installed, `discourse-setup` will automatically install it from get.docker.com. ### Install Discourse -Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd] into it: +Clone the [Official Discourse Docker Image][dd] into `/var/discourse`. sudo -s git clone https://github.com/discourse/discourse_docker.git /var/discourse