382 Commits

Author SHA1 Message Date
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
Luigi Maselli
7b9d180b2d me in AUTHORS 2013-07-01 00:33:01 +02:00
Jeff Lindsay
538925f7f4 Merge pull request #59 from grigio/master
Websocket support in NGINX ( ex: #45 )
2013-06-30 15:11:42 -07:00
Luigi Maselli
4d77b668b4 websocket test init 2013-06-30 23:59:06 +02:00
Luigi Maselli
de906a22aa websocket support in NGINX , see: #45 2013-06-30 23:44:58 +02:00
Jeff Lindsay
60f29cdb18 adding some basic help, also as another example of using plugin hooks 2013-06-30 15:51:41 -05:00
Jeff Lindsay
997d2dd09c only override url if vhost file exists 2013-06-30 12:02:52 -05:00
Jeff Lindsay
071c446315 Merge branch 'dev' 2013-06-30 11:46:11 -05:00
Jeff Lindsay
5c0f7320cf doing it the mike-park way 2013-06-30 11:45:27 -05:00
Jeff Lindsay
c4fd6d620b nginx vhosts as a plugin? 2013-06-30 11:39:05 -05:00
Jeff Lindsay
51dc343630 make sure to not fail 2013-06-30 11:15:13 -05:00
Jeff Lindsay
79b099e401 moving install hook trigger into make install 2013-06-30 11:13:23 -05:00
Jeff Lindsay
6be113f7de using absolute path for plugins 2013-06-30 11:02:40 -05:00
Jeff Lindsay
1ebfc9486a forgot how to use wget 2013-06-30 10:41:47 -05:00
Jeff Lindsay
17953fc5a0 initial attempt at plugins 2013-06-30 10:37:32 -05:00
Jeff Lindsay
98859df6d6 only run travis for master 2013-06-30 10:36:54 -05:00
Jeff Lindsay
c08f3233e9 rolled into dokku 2013-06-30 08:51:28 -05:00
Jeff Lindsay
183d8f6ed3 ppa still 0.4.6, so no luck testing 0.4.7 easily either 2013-06-30 08:50:10 -05:00
Jeff Lindsay
caa03d0554 forgot to offest args vars 2013-06-30 08:36:49 -05:00
Jeff Lindsay
6d2954d11b nope, no luck for testing branches 2013-06-30 08:29:40 -05:00
Jeff Lindsay
3ce4897264 hopefully get travis to test this particular branch 2013-06-30 08:17:34 -05:00
Jeff Lindsay
1ee35cb3b9 fairly major refactoring. consolidating code into dokku script. also, went back to installing docker from ppa 2013-06-30 08:04:50 -05:00
Jeff Lindsay
0d49424c45 source based roadmap file dropped in favor of issue tracked roadmaps. for example: https://github.com/progrium/dokku/issues/55 2013-06-30 02:29:28 -05:00
Jeff Lindsay
7ecdba7387 poor man's retry 2013-06-30 02:27:36 -05:00
Jeff Lindsay
fc396490dd exiting with 7 means could not connect. adding sleep to give container a second to spin up 2013-06-30 01:47:10 -05:00
Jeff Lindsay
65fb3c18c3 irc notifications 2013-06-30 01:30:14 -05:00
Jeff Lindsay
977d1269a7 excellent CI system catching my mistakes 2013-06-30 01:28:32 -05:00
Jeff Lindsay
70be1daec4 removing buildstep submodule and replacing it with the buildstep script that dokku actually uses. the buildstep project is otherwise completely separate other than the artifact it builds (the progrium/buildstep container) 2013-06-30 01:17:32 -05:00
Jeff Lindsay
dc2c4825d8 Update README.md 2013-06-29 16:13:00 -05:00
Jeff Lindsay
d5e264d5b5 Merge pull request #50 from dgryski/master
Fix go test
2013-06-28 17:08:53 -07:00
Damian Gryski
0d6d7cdbed tests: reenable go test 2013-06-24 21:50:46 +02:00
Damian Gryski
601bbc2efd tests: "something" doesn't like the app just being called 'go'
s/go/web/ in the heroku metadata files fixes this test.
2013-06-24 21:45:13 +02:00
Jeff Lindsay
b15b55f4af outputting result from curl for deploy debugging 2013-06-23 18:35:30 -07:00
Jeff Lindsay
964299d167 disabling go app since it is broken atm 2013-06-23 18:13:35 -07:00