Merge pull request #219 from jaseg/patch-1
Update Makefile: Do not try to install on "make" or "make all"
This commit is contained in:
commit
925a0b0f05
2 files changed
+7
-4
No files matched your search
@@ -4,9 +4,12 @@ PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_
|
|||||||
STACK_URL ?= github.com/progrium/buildstep
|
STACK_URL ?= github.com/progrium/buildstep
|
||||||
PREBUILT_STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep_c30652f59a.tgz
|
PREBUILT_STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep_c30652f59a.tgz
|
||||||
|
|
||||||
all: dependencies stack install plugins
|
all:
|
||||||
|
# Type "make install" to install.
|
||||||
|
|
||||||
install:
|
install: dependencies stack copyfiles plugins
|
||||||
|
|
||||||
|
copyfiles:
|
||||||
cp dokku /usr/local/bin/dokku
|
cp dokku /usr/local/bin/dokku
|
||||||
cp receiver /home/git/receiver
|
cp receiver /home/git/receiver
|
||||||
mkdir -p /var/lib/dokku/plugins
|
mkdir -p /var/lib/dokku/plugins
|
||||||
|
|||||||
@@ -102,14 +102,14 @@ the repository and calling the install script. Example:
|
|||||||
|
|
||||||
$ git clone https://github.com/yourusername/dokku.git
|
$ git clone https://github.com/yourusername/dokku.git
|
||||||
$ cd dokku
|
$ cd dokku
|
||||||
$ sudo make all
|
$ sudo make install
|
||||||
|
|
||||||
The `Makefile` allows source URLs to be overridden to include customizations from your own
|
The `Makefile` allows source URLs to be overridden to include customizations from your own
|
||||||
repositories. The DOCKER_URL, GITRECEIVE_URL, PLUGINHOOK_URL, SSHCOMMAND_URL and STACK_URL
|
repositories. The DOCKER_URL, GITRECEIVE_URL, PLUGINHOOK_URL, SSHCOMMAND_URL and STACK_URL
|
||||||
environment variables may be set to override the defaults (see the `Makefile` for how these
|
environment variables may be set to override the defaults (see the `Makefile` for how these
|
||||||
apply). Example:
|
apply). Example:
|
||||||
|
|
||||||
$ sudo GITRECEIVE_URL=https://raw.github.com/yourusername/gitreceive/master/gitreceive make all
|
$ sudo GITRECEIVE_URL=https://raw.github.com/yourusername/gitreceive/master/gitreceive make install
|
||||||
|
|
||||||
## Advanced installation (bootstrap a server from your own repository)
|
## Advanced installation (bootstrap a server from your own repository)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user