Commit Graph
14315 Commits
Author SHA1 Message Date
Jeff Lindsay 154d76e314 vagrant file uses local dokku checkout instead of pulling from repo via bootstrap. vagrant no longer uses the bootstrap script 2013-07-16 00:47:57 -07:00
Jeff Lindsay 39b05a1b20 disabling go since its now broken with docker 0.4.8 2013-07-16 00:47:11 -07:00
Jeff Lindsay c8633db721 docker failed to connect to server immediately after installing, so maybe it needed a moment? 2013-07-16 02:05:34 -05:00
Jeff Lindsay d160036954 docker 0.4.8 (but really basically 0.5.0) 2013-07-16 01:59:10 -05:00
Eugene Ware f4cdc94209 don't use fully qualified name if a subdomain of $HOME/VHOST 2013-07-08 21:12:37 +10:00
Eugene Ware 3eadb0ae03 support for fully qualified domain names 2013-07-08 15:50:17 +10:00
Eugene Ware 6c6196fd5a check file exists before removing 2013-07-08 15:07:41 +10:00
Jeff Lindsay b433626b4e use docker 0.4.8 deb, but 0.4.2 binary. sigh 2013-07-07 18:12:39 -07:00
Jeff Lindsay 3d1c8a30e9 Merge pull request #84 from hwartig/update-docker
Update docker to latest version 0.4.8-1 .
2013-07-07 12:50:38 -07:00
Harald Wartig 3aa6340c06 Update docker to latest version 0.4.8-1 . 2013-07-07 17:44:57 +02:00
Eugene Ware 1f4dab1fd8 make reloader service start on reload 2013-07-07 20:27:23 +10:00
Eugene Ware ee40473a18 Remove socket file before listening for reload 2013-07-07 20:17:19 +10:00
Jeff Lindsay ea14fb0543 Merge pull request #77 from asm89/bootstrap
Tune bootstrap/install script and documentation for advanced installation
2013-07-04 22:55:05 -07:00
Alexander 264d196eee Merge remote-tracking branch 'origin/master' into bootstrap
Conflicts:
	README.md
2013-07-05 07:42:01 +02:00
Jeff Lindsay 1f45937abc Merge pull request #71 from ekristen/master
Fixes http host header
2013-07-04 22:29:22 -07:00
Jeff Lindsay c118c20b36 Merge pull request #75 from interstateone/wget-filename
Change filename used in Advanced Installation section of README
2013-07-04 22:24:42 -07:00
Jeff Lindsay 5493236d7e Merge pull request #79 from ema/master
Set right conf file name in README.md
2013-07-04 12:38:21 -07:00
Emanuele Rocca bc852395cc Point to the right conf file for domain name
README.md states that the domain name should be set in ~git/DOMAIN. However,
~git/VHOST is the right file for that setting.
2013-07-04 17:01:42 +02:00
Alexander 49f1c444c4 cde -> cd 2013-07-03 09:06:08 +02:00
Alexander 621de7cbd1 We don't want the progrium version here ;) 2013-07-02 23:41:48 +02:00
Alexander 99dcacd991 Tune "Advanced installation" documentation 2013-07-02 23:28:14 +02:00
Alexander 713365f53d Make it possible to override dependency urls 2013-07-02 23:20:45 +02:00
Alexander 5065810bf0 Move copying of plugins to install target 2013-07-02 23:06:35 +02:00
Alexander eaa486e888 Separate plugin-install command 2013-07-02 23:04:17 +02:00
Brandon Evans 04e0618833 Just use the non-redirected URL instead 2013-07-02 14:32:18 -06:00
Brandon Evans 30bd933e68 Change filename used in Advanced Installation section of README
wget uses the given url to name the downloaded file and doesn't take the redirect into account
2013-07-02 14:21:24 -06:00
Jeff Lindsay 67958431b0 Merge pull request #74 from asm89/patch-4
Fix typo
2013-07-02 12:54:58 -07:00
Alexander e08aac8b46 Fix typo 2013-07-02 21:53:54 +02:00
Jeff Lindsay 65f1dd7072 Merge pull request #73 from asm89/patch-3
Add progrium/pluginhook to README
2013-07-02 12:52:47 -07:00
Alexander a3cf19b9b5 Add progrium/pluginhook to README 2013-07-02 21:51:24 +02:00
Erik a0eb48c32b ensure that the original http_host gets passed in the proxy to the app 2013-07-02 10:20:29 -04:00
Jeff Lindsay bc249ef5ac lets avoid pointless redundancies 2013-07-02 03:20:29 -05:00
Jeff Lindsay 2dfe1e1b05 refactoring most of bootstrap into makefile. bootstrap supports branch checkouts, and using existing cloned dokku repos 2013-07-02 03:12:43 -05:00
Jeff Lindsay 19a0ee20e7 Merge pull request #70 from rhy-jot/master
Fix placement of my username
2013-07-01 16:58:17 -07:00
rhy-jot e8e6267114 Fix placement of my username 2013-07-01 16:49:08 -07:00
Jeff Lindsay ee80167c0c Merge pull request #69 from asm89/authors
Add me to authors and sort
2013-07-01 15:15:38 -07:00
Alexander bcd3ba3c66 Add me to authors and sort 2013-07-02 00:09:49 +02:00
Jeff Lindsay 5e08d92040 Merge pull request #68 from asm89/vagrant-test-setup
Fix vagrant test setup
2013-07-01 15:09:47 -07:00
Alexander 5653eedac4 Fix vagrant test setup 2013-07-02 00:02:37 +02:00
Jeff Lindsay 407e3f04c4 Merge pull request #65 from asm89/makefile
Create separate copy target in Makefile
2013-07-01 14:32:43 -07:00
Jeff Lindsay 6d8232dc20 Merge pull request #62 from asm89/patch-1
Run apt-get update after adding ppa
2013-07-01 14:15:46 -07:00
Jeff Lindsay 9623b4c474 Merge pull request #64 from asm89/patch-2
Escape variable in nginx post-deploy script
2013-07-01 12:12:47 -07:00
Jeff Lindsay 47ca5bd4e0 Merge pull request #67 from asm89/pre-deploy-hook
[WIP] Add pre-deploy hook
2013-07-01 12:09:05 -07:00
Alexander cf7a2a00d4 Add pre-deploy hook
Adds a pre-deploy hook passing the name of the app and the image. The
hook allows plugins to setup external resources (such as databases) and
modify the image (running pre-deployment script from the app) before the
application is deployed by dokku.
2013-07-01 13:54:34 +02:00
Alexander 1024492c3d Create separate copy target in Makefile 2013-07-01 11:38:38 +02:00
Alexander 4f07b7af1c Escape variable in nginx post-deploy script
`$http_upgrade` is supposed to be a variable set by nginx. It was now substituted by nothing.
2013-07-01 11:33:23 +02:00
Alexander e75099d5e0 Run apt-get update after adding ppa 2013-07-01 11:08:46 +02:00
Jeff Lindsay 0b07e4e4e3 more specific line counts 2013-06-30 17:56:02 -05:00
Jeff Lindsay 4ecb13a918 disabling websocket test since its currently broken 2013-06-30 17:55:45 -05:00
Jeff Lindsay 1626b10539 Merge pull request #60 from grigio/master
+ AUTHORS
2013-06-30 15:36:40 -07:00