Change targets to vagrant-*
This commit is contained in:
1 parent
ab44c915a8
commit
b9eed22e35
2 files changed
+7
-7
No files matched your search
@@ -6,15 +6,15 @@ 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
|
||||||
|
|
||||||
# If the first argument is "dokku"...
|
# If the first argument is "vagrant-dokku"...
|
||||||
ifeq (dokku,$(firstword $(MAKECMDGOALS)))
|
ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
|
||||||
# use the rest as arguments for "dokku"
|
# use the rest as arguments for "vagrant-dokku"
|
||||||
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
||||||
# ...and turn them into do-nothing targets
|
# ...and turn them into do-nothing targets
|
||||||
$(eval $(RUN_ARGS):;@:)
|
$(eval $(RUN_ARGS):;@:)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count acl-add dokku
|
.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count vagrant-acl-add vagrant-dokku
|
||||||
|
|
||||||
all:
|
all:
|
||||||
# Type "make install" to install.
|
# Type "make install" to install.
|
||||||
@@ -80,8 +80,8 @@ count:
|
|||||||
@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-acl-add:
|
||||||
vagrant ssh -- sudo sshcommand acl-add dokku $(USER)
|
vagrant ssh -- sudo sshcommand acl-add dokku $(USER)
|
||||||
|
|
||||||
dokku:
|
vagrant-dokku:
|
||||||
vagrant ssh -- "sudo -H -u root bash -c 'dokku $(RUN_ARGS)'"
|
vagrant ssh -- "sudo -H -u root bash -c 'dokku $(RUN_ARGS)'"
|
||||||
@@ -118,7 +118,7 @@ sudo BUILD_STACK=true make install
|
|||||||
- Add SSH key to Dokku using `sshcommand`:
|
- Add SSH key to Dokku using `sshcommand`:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cat ~/.ssh/id_rsa.pub | make acl-add
|
cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
|
||||||
```
|
```
|
||||||
|
|
||||||
You are now ready to deploy an app or install plugins.
|
You are now ready to deploy an app or install plugins.
|
||||||
|
|||||||
Reference in new issue
Block a user