From: Daniel Porter <dpreid@gmail.com>
Date: Mon, 17 Aug 2015 14:18:54 +0000 (+0100)
Subject: Clarify Ubuntu-specific docker install instructions
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5933f55920e86e63ec715e4f7a24c416bde8718d;p=discourse_docker.git

Clarify Ubuntu-specific docker install instructions
---

diff --git a/launcher b/launcher
index 0de14df..20038c8 100755
--- a/launcher
+++ b/launcher
@@ -187,16 +187,14 @@ get_ssh_pub_key() {
 
 install_docker() {
 
-  echo "Docker is not installed, make sure you are running on the 3.8 kernel"
-  echo "The best supported Docker release is Ubuntu 12.04.03 for it run the following"
+  echo "Docker is not installed, you will need to install Docker in order to run Discourse"
+  echo "Please visit https://docs.docker.com/installation/ for instructions on how to do this for your system"
   echo
-  echo "sudo apt-get update"
-  echo "sudo apt-get install linux-image-generic-lts-raring linux-headers-generic-lts-raring"
-  echo "sudo reboot"
+  echo "If you are running Ubuntu Trusty or later, you can try the following:"
   echo
 
   echo "sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
-  echo "sudo sh -c \"echo deb https://apt.dockerproject.org/repo ubuntu-precise main > /etc/apt/sources.list.d/docker.list\""
+  echo "sudo sh -c \"echo deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -sc) main > /etc/apt/sources.list.d/docker.list\""
   echo "sudo apt-get update"
   echo "sudo apt-get install docker-engine"