From 14145eebb1a640efab7d77624bd1fe3ae0ed8690 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 4 Oct 2014 18:37:23 -0400 Subject: [PATCH] Simplify the vagrant workflow - Moved from wget to cloning the repository - Add acl-add command to Make - Modify the docs to use the new methodology --- Makefile | 6 +++++- docs/installation.md | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8ca2b4bb7..869e56f0d 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ STACK_URL ?= https://github.com/progrium/buildstep.git PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-03-08/2014-03-08_429d4a9deb.tar.gz DOKKU_ROOT ?= /home/dokku -.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count +.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count acl-add all: # Type "make install" to install. @@ -71,3 +71,7 @@ count: @find plugins -type f | xargs cat | wc -l @echo "Test lines:" @find tests -type f | xargs cat | wc -l + +acl-add: + vagrant ssh -- sudo sshcommand acl-add dokku $(USER) + diff --git a/docs/installation.md b/docs/installation.md index 62c5f9771..79b6e5815 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -85,10 +85,10 @@ sudo BUILD_STACK=true make install - Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) - Download and install [Vagrant](http://www.vagrantup.com/downloads.html) -- Download Dokku (latest stable) +- Clone Dokku ``` - wget https://github.com/progrium/dokku/archive/master.zip + git clone git@github.com:progrium/dokku.git ``` - Setup SSH hosts in your `/etc/hosts` @@ -115,10 +115,10 @@ sudo BUILD_STACK=true make install vagrant up ``` -- Add SSH key to Dokku using `sshcommand acl-add `, e.g.: +- Add SSH key to Dokku using `sshcommand`: - ``` - cat ~/.ssh/id_rsa.pub | ssh -i ~/.vagrant.d/insecure_private_key vagrant@dokku.me "sudo sshcommand acl-add dokku progrium" + ```bash + cat ~/.ssh/id_rsa.pub | make acl-add ``` You are now ready to deploy an app or install plugins.