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
This commit is contained in:
Jose Diaz-Gonzalez committed 2014-10-04 18:39:31 -04:00
1 parent a67c2c927d
commit 14145eebb1
2 files changed
+10 -6

No files matched your search

+5 -1
View File
@@ -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 PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-03-08/2014-03-08_429d4a9deb.tar.gz
DOKKU_ROOT ?= /home/dokku 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: all:
# Type "make install" to install. # Type "make install" to install.
@@ -71,3 +71,7 @@ count:
@find plugins -type f | xargs cat | wc -l @find plugins -type f | xargs cat | wc -l
@echo "Test lines:" @echo "Test lines:"
@find tests -type f | xargs cat | wc -l @find tests -type f | xargs cat | wc -l
acl-add:
vagrant ssh -- sudo sshcommand acl-add dokku $(USER)
+5 -5
View File
@@ -85,10 +85,10 @@ sudo BUILD_STACK=true make install
- Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) - Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
- Download and install [Vagrant](http://www.vagrantup.com/downloads.html) - 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` - Setup SSH hosts in your `/etc/hosts`
@@ -115,10 +115,10 @@ sudo BUILD_STACK=true make install
vagrant up vagrant up
``` ```
- Add SSH key to Dokku using `sshcommand acl-add <user> <ssh-key-name>`, e.g.: - Add SSH key to Dokku using `sshcommand`:
``` ```bash
cat ~/.ssh/id_rsa.pub | ssh -i ~/.vagrant.d/insecure_private_key vagrant@dokku.me "sudo sshcommand acl-add dokku progrium" cat ~/.ssh/id_rsa.pub | make acl-add
``` ```
You are now ready to deploy an app or install plugins. You are now ready to deploy an app or install plugins.