From 62b5ca20df367cddf861b0a111e1778b8415ada0 Mon Sep 17 00:00:00 2001 From: John Doherty Date: Tue, 11 Oct 2016 00:33:01 +0100 Subject: [PATCH 1/3] Added "Dokku setup using a Mac" steps It would be great to add additional blocks for Windows and Linux --- docs/getting-started/install/digitalocean.md | 54 +++++++++++++++++--- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/docs/getting-started/install/digitalocean.md b/docs/getting-started/install/digitalocean.md index 0ffc5d6f4..4391f3193 100644 --- a/docs/getting-started/install/digitalocean.md +++ b/docs/getting-started/install/digitalocean.md @@ -1,11 +1,53 @@ -# Digital Ocean +# Digital Ocean Droplet -On Digital Ocean, there is a pre-made image that can be run for Dokku. You can choose to run this image on any sized droplet, though larger droplets will allow you to run larger applications. +[Digital Ocean](https://www.digitalocean.com/products/compute/) offers a pre-installed Dokku image. You can run this image on any sized droplet, although larger droplets will allow you to run larger applications. -When choosing your Droplet configuration, please disable IPv6 on the droplet. There are known issues with IPv6 on Digital Ocean and Docker, and many have been reported to the Dokku issue tracker. +When choosing your Droplet configuration please disable IPv6. There are known issues with IPv6 on Digital Ocean and Docker, and many have been reported to the Dokku issue tracker. If you would like to run Dokku on an IPv6 Digital Ocean Droplet, please consult [this guide](https://jeffloughridge.wordpress.com/2015/01/17/native-ipv6-functionality-in-docker/). -If you would like to run Dokku on an IPv6 Digital Ocean Droplet, please consult [this guide](https://jeffloughridge.wordpress.com/2015/01/17/native-ipv6-functionality-in-docker/) for modifying Docker to run under the Digital Ocean IPv6 configuration. +## Dokku setup using a Mac -Once Dokku is installed, you can then proceed to the ip address or domain name associated with your server to complete the web-based installation. +1. Login to your [Digital Ocean](https://m.do.co/c/d716c8c29fb5) account -If you wish for a more unattended installation method, see [these](http://dokku.viewdocs.io/dokku/getting-started/install/debian/#unattended-installation) docs. +2. Click **Create a Droplet** + +3. Under **Choose an image > One-click apps** and choose **Dokku 0.6.5 on 14.04** _(version numbers may vary)_ + +4. Under **Choose a size** and select your a machine spec + +5. Under **Choose a datacenter region** select your region + +6. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_ + +7. From your terminal, execute `cat ~/.ssh/id_rsa.pub` + +8. Copy the output and paste it into the **New SSH Key** dialog, provide a name and click **Add SSH Key** + +9. Under **Finalize and create**, give your droplet a hostname _(not required)_ and click **Create** + +10. Once created, copy the IP address to your clipboard + +11. From your terminal, verify you can connect by executing `ssh root@ip-address` - then disconnect using `exit` + +12. From your terminal execute `cat ~/.ssh/id_rsa.pub` to get your public key and copy it's output to your clipboard + +13. Open a text editor and build the following line: `echo "paste ssh key from clipboard" | sshcommand acl-add dokku user` _(removing line breaks)_ + +14. From terminal execute `ssh root@ip-address` to reconnect to your server + +15. From your server, execute `echo "your ssh key without line breaks should be in here" | sshcommand acl-add dokku user` + +16. Then execute `exit` to disconnect from your server + +17. Now try to connect as the dokku user `ssh dokku@ip-address` _(this should return dokku help and disconnect)_ + +18. Now, go into your git project and add git remote host `git remote add dokku dokku@ip-of-host:appname` + +19. You should now be able to execute `git push dokku master` + +## Troubleshooting + +Should you have any issues, please visit the [freenode chat](https://webchat.freenode.net/?channels=dokku) + +## Unattended Installation + +It is possible to setup Dokku using an unattended installation method using the following [guide](http://dokku.viewdocs.io/dokku/getting-started/install/debian/#unattended-installation) From c74bd93c588c25571433a157718961dc9fabda7b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 20 Apr 2017 21:04:40 -0600 Subject: [PATCH 2/3] docs: Respond to comments in digitalocean docs [ci skip] --- docs/getting-started/install/digitalocean.md | 63 ++++++-------------- 1 file changed, 17 insertions(+), 46 deletions(-) diff --git a/docs/getting-started/install/digitalocean.md b/docs/getting-started/install/digitalocean.md index 4391f3193..0611d616b 100644 --- a/docs/getting-started/install/digitalocean.md +++ b/docs/getting-started/install/digitalocean.md @@ -2,52 +2,23 @@ [Digital Ocean](https://www.digitalocean.com/products/compute/) offers a pre-installed Dokku image. You can run this image on any sized droplet, although larger droplets will allow you to run larger applications. -When choosing your Droplet configuration please disable IPv6. There are known issues with IPv6 on Digital Ocean and Docker, and many have been reported to the Dokku issue tracker. If you would like to run Dokku on an IPv6 Digital Ocean Droplet, please consult [this guide](https://jeffloughridge.wordpress.com/2015/01/17/native-ipv6-functionality-in-docker/). +> When choosing your Droplet configuration please disable IPv6. There are known issues with IPv6 on Digital Ocean and Docker, and many have been reported to the Dokku issue tracker. If you would like to run Dokku on an IPv6 Digital Ocean Droplet, please consult [this guide](https://jeffloughridge.wordpress.com/2015/01/17/native-ipv6-functionality-in-docker/). -## Dokku setup using a Mac +## Dokku setup 1. Login to your [Digital Ocean](https://m.do.co/c/d716c8c29fb5) account - -2. Click **Create a Droplet** - -3. Under **Choose an image > One-click apps** and choose **Dokku 0.6.5 on 14.04** _(version numbers may vary)_ - -4. Under **Choose a size** and select your a machine spec - -5. Under **Choose a datacenter region** select your region - -6. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_ - -7. From your terminal, execute `cat ~/.ssh/id_rsa.pub` - -8. Copy the output and paste it into the **New SSH Key** dialog, provide a name and click **Add SSH Key** - -9. Under **Finalize and create**, give your droplet a hostname _(not required)_ and click **Create** - -10. Once created, copy the IP address to your clipboard - -11. From your terminal, verify you can connect by executing `ssh root@ip-address` - then disconnect using `exit` - -12. From your terminal execute `cat ~/.ssh/id_rsa.pub` to get your public key and copy it's output to your clipboard - -13. Open a text editor and build the following line: `echo "paste ssh key from clipboard" | sshcommand acl-add dokku user` _(removing line breaks)_ - -14. From terminal execute `ssh root@ip-address` to reconnect to your server - -15. From your server, execute `echo "your ssh key without line breaks should be in here" | sshcommand acl-add dokku user` - -16. Then execute `exit` to disconnect from your server - -17. Now try to connect as the dokku user `ssh dokku@ip-address` _(this should return dokku help and disconnect)_ - -18. Now, go into your git project and add git remote host `git remote add dokku dokku@ip-of-host:appname` - -19. You should now be able to execute `git push dokku master` - -## Troubleshooting - -Should you have any issues, please visit the [freenode chat](https://webchat.freenode.net/?channels=dokku) - -## Unattended Installation - -It is possible to setup Dokku using an unattended installation method using the following [guide](http://dokku.viewdocs.io/dokku/getting-started/install/debian/#unattended-installation) +2. Click **Create a Droplet**. +3. Under **Choose an image > One-click apps** and choose the latest **Dokku** release for 16.04 _(version numbers may vary)_. +4. Under **Choose a size** and select your a machine spec. We recommend a machine with _at least_ 1GB of memory. +5. Under **Choose a datacenter region** select your region. +6. Add an SSH Key + * New Keys + 1. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_ + 2. From your terminal, execute `cat $HOME/.ssh/id_rsa.pub` + 3. Copy the output and paste it into the **New SSH Key** dialog, provide a name and click **Add SSH Key** + * Existing Keys + 1. Simply add a checkmark next to the existing keys you'd like to add. +7. Under **Finalize and create**, give your droplet a hostname _(not required)_ and click **Create**. +8. Once created, copy the IP address to your clipboard. +9. In a browser, go to the IP address you copied above and fill out the presented form to complete configuration. **Failure to do so may allow others to reconfigure SSH access on your server.** +10. Once the web ui has been submitted, you will be redirected to our [application deployment tutorial](http://dokku.viewdocs.io/dokku/deployment/application-deployment/), which will guide you through deploying a sample application to your Dokku server. From 2f819d1d1ccc31bf646c1fb0e566c2b3b930b2ad Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 20 Apr 2017 21:06:43 -0600 Subject: [PATCH 3/3] docs: remove header Also use the account associated with Dokku for referrals. [ci skip] --- docs/getting-started/install/digitalocean.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/getting-started/install/digitalocean.md b/docs/getting-started/install/digitalocean.md index 0611d616b..186ef3418 100644 --- a/docs/getting-started/install/digitalocean.md +++ b/docs/getting-started/install/digitalocean.md @@ -4,9 +4,7 @@ > When choosing your Droplet configuration please disable IPv6. There are known issues with IPv6 on Digital Ocean and Docker, and many have been reported to the Dokku issue tracker. If you would like to run Dokku on an IPv6 Digital Ocean Droplet, please consult [this guide](https://jeffloughridge.wordpress.com/2015/01/17/native-ipv6-functionality-in-docker/). -## Dokku setup - -1. Login to your [Digital Ocean](https://m.do.co/c/d716c8c29fb5) account +1. Login to your [Digital Ocean](https://m.do.co/c/fe06b043a083) account 2. Click **Create a Droplet**. 3. Under **Choose an image > One-click apps** and choose the latest **Dokku** release for 16.04 _(version numbers may vary)_. 4. Under **Choose a size** and select your a machine spec. We recommend a machine with _at least_ 1GB of memory.