这是indexloc提供的服务，不要输入任何密码
Skip to content

Add dependencies hook #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add dependencies hook #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe4f5e
Add a dependencies hook for plugin dependency management
wingrunr21 Oct 29, 2013
aa60543
Fix final key upload message to be inline with README
wingrunr21 Oct 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ PREBUILT_STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep
all:
# Type "make install" to install.

install: dependencies stack copyfiles plugins
install: dependencies stack copyfiles plugin-dependencies plugins

copyfiles:
cp dokku /usr/local/bin/dokku
mkdir -p /var/lib/dokku/plugins
cp -r plugins/* /var/lib/dokku/plugins

plugin-dependencies: pluginhook
dokku plugins-install-dependencies

plugins: pluginhook docker
dokku plugins-install

Expand Down
2 changes: 1 addition & 1 deletion bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ make install

echo
echo "Be sure to upload a public key for your user:"
echo " cat ~/.ssh/id_rsa.pub | ssh root@$HOSTNAME \"gitreceive upload-key progrium\""
echo " cat ~/.ssh/id_rsa.pub | ssh $HOSTNAME \"sudo sshcommand acl-add dokku progrium\""
4 changes: 4 additions & 0 deletions dokku
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ case "$1" in
pluginhook install
;;

plugins-install-dependencies)
pluginhook dependencies
;;

# temporary hack for https://github.com/progrium/dokku/issues/82
deploy:all)
for app in $(ls -d $DOKKU_ROOT/*/); do
Expand Down
6 changes: 6 additions & 0 deletions plugins/nginx-vhosts/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

# latest stable NGINX 1.4.x with websocket support
add-apt-repository -y ppa:nginx/stable
apt-get update
apt-get install -y nginx dnsutils
5 changes: 0 additions & 5 deletions plugins/nginx-vhosts/install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/bin/bash

# latest stable NGINX 1.4.x with websocket support
add-apt-repository -y ppa:nginx/stable
apt-get update
apt-get install -y nginx dnsutils

if ! grep -q dokku-nginx-reload "/etc/sudoers"; then
touch /etc/sudoers.tmp
cp /etc/sudoers /tmp/sudoers.new
Expand Down