From e0b994c4153ee464b04d6fc82d7354905c009a07 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 27 Nov 2014 15:09:46 -0500 Subject: [PATCH 1/2] Standardize on dokku.me as the test hostname. Refs #795 --- docs/application-deployment.md | 28 ++++++++++++++-------------- docs/installation.md | 2 +- docs/remote-commands.md | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/application-deployment.md b/docs/application-deployment.md index 6815c3124..7c9970831 100644 --- a/docs/application-deployment.md +++ b/docs/application-deployment.md @@ -4,8 +4,8 @@ Now you can deploy apps on your Dokku. Let's deploy the [Heroku Node.js sample a ``` $ cd node-js-sample -$ git remote add progrium dokku@progriumapp.com:node-js-app -$ git push progrium master +$ git remote add dokku dokku@dokku.me:node-js-app +$ git push dokku master Counting objects: 296, done. Delta compression using up to 4 threads. Compressing objects: 100% (254/254), done. @@ -18,12 +18,12 @@ Total 296 (delta 25), reused 276 (delta 13) ... blah blah blah ... -----> Application deployed: - http://node-js-app.progriumapp.com + http://node-js-app.dokku.me ``` You're done! -Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push progrium :master``` +Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push dokku :master``` Right now Buildstep supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/progrium/buildstep#supported-buildpacks). It's not hard to add more, [go add more](https://github.com/progrium/buildstep#adding-buildpacks)! Please check the documentation for your particular build pack as you may need to include configuration files (such as a Procfile) in your project root. @@ -53,33 +53,33 @@ Alternatively, you may push an app to your dokku host with a name like "00-defau The name of remote repository is used as the name of application to be deployed, as for example above: - $ git remote add progrium git@progriumapp.com:node-js-app - $ git push progrium master + $ git remote add dokku git@dokku.me:node-js-app + $ git push dokku master Is deployed to, remote: -----> Application deployed: - remote: http://node-js-app.progriumapp.com + remote: http://node-js-app.dokku.me -You can also specify fully qualified names, say `app.progrium.com`, as +You can also specify fully qualified names, say `app.dokku.me`, as - $ git remote add progrium git@progriumapp.com:app.progrium.com - $ git push progrium master + $ git remote add dokku git@dokku.me:app.dokku.me + $ git push dokku master So, after deployment the application will be available at, remote: -----> Application deployed: - remote: http://app.progrium.com + remote: http://app.dokku.me This is in particular useful, then you want to deploy to root domain, as - $ git remote add progrium git@progriumapp.com:progrium.com - $ git push progrium master + $ git remote add dokku git@dokku.me:dokku.me + $ git push dokku master ... deployment ... remote: -----> Application deployed: - remote: http://progrium.com + remote: http://dokku.me # Removing a deployed app diff --git a/docs/installation.md b/docs/installation.md index 86e51132d..13c092667 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -20,7 +20,7 @@ Set up a domain and a wildcard domain pointing to that host. Make sure `/home/do You'll have to add a public key associated with a username by doing something like this from your local machine: - $ cat ~/.ssh/id_rsa.pub | ssh progriumapp.com "sudo sshcommand acl-add dokku progrium" + $ cat ~/.ssh/id_rsa.pub | ssh dokku.me "sudo sshcommand acl-add dokku $USER" That's it! diff --git a/docs/remote-commands.md b/docs/remote-commands.md index 2b90861bc..9b0952a6f 100644 --- a/docs/remote-commands.md +++ b/docs/remote-commands.md @@ -1,11 +1,11 @@ # Remote commands -Dokku commands can be run over ssh. Anywhere you would run `dokku `, just run `ssh -t dokku@progriumapp.com ` +Dokku commands can be run over ssh. Anywhere you would run `dokku `, just run `ssh -t dokku@dokku.me ` The `-t` is used to request a pty. It is highly recommended to do so. To avoid the need to type the `-t` option each time, simply create/modify a section in the `.ssh/config` on the client side, as follows: ``` -Host progriumapp.com +Host dokku.me RequestTTY yes ``` From 8c8f5e17f1554740b72dda7d8d30a0d1ad658da4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 27 Nov 2014 15:10:33 -0500 Subject: [PATCH 2/2] Tell users to change directory to dokku before running vagrant up. Refs #795 --- docs/installation.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/installation.md b/docs/installation.md index 13c092667..5c5a46bb9 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -110,6 +110,7 @@ sudo BUILD_STACK=true make install # - `BOX_MEMORY` # - `DOKKU_DOMAIN` # - `DOKKU_IP`. + cd path/to/dokku vagrant up ```