Commit Graph
100 Commits
Author SHA1 Message Date
Jeff Lindsay 9b6322e96b Update index.md
clarifying multitenancy
2015-02-01 14:08:49 -06:00
Jeff Lindsay 470755babe Merge pull request #748 from vincentfretin/patch-2
fix dokku development blog link
2014-11-11 09:04:02 -06:00
Jeff Lindsay c092dd1719 deis sponsorship 2014-10-28 11:25:45 -05:00
Jeff Lindsay 4e9d797d45 Merge pull request #657 from arthurnn/CNAME_option
Add CNAME option
2014-08-19 16:28:43 -05:00
Jeff Lindsay 07cdab6187 Merge pull request #562 from assaf/zero-downtime
Zero down-time deploy and server checks
2014-08-18 21:08:09 -05:00
Jeff Lindsay 8760c94143 Merge pull request #628 from voronianski/master
Update Vagrant box to trusty because of raring server issues
2014-08-08 12:49:30 -05:00
Jeff Lindsay a9e0a7b57e remove any default enabled sites for nginx 2013-11-21 13:03:55 -06:00
Jeff Lindsay b59e36af3f wait longer for host to be running gitreceive 2013-11-08 15:28:25 -08:00
Jeff Lindsay a2fb231810 be sure to push to master 2013-11-08 15:25:15 -08:00
Jeff Lindsay 2ac9996b27 kill it 2013-11-08 15:17:53 -08:00
Jeff Lindsay a159c5a708 new travis config 2013-11-08 15:15:06 -08:00
Jeff Lindsay a3c561c69d disabling php 2013-11-08 14:47:14 -08:00
Jeff Lindsay 48aba9567f changes to the environment 2013-11-08 14:43:30 -08:00
Jeff Lindsay 960f9503e3 remove build dir if exists. use absolute paths 2013-11-08 14:22:21 -08:00
Jeff Lindsay 75a5466650 boot is now an image setup script. receiver updated to work with gitreceive-next 2013-11-08 14:19:30 -08:00
Jeff Lindsay 986acb28b5 gopath 2013-11-08 14:01:51 -08:00
Jeff Lindsay b732fc58c0 ci stuff 2013-11-08 13:45:12 -08:00
Jeff Lindsay 94b77a8c8b more obvious/standard/short 2013-11-07 08:32:20 -08:00
Jeff Lindsay 0e0135284c doc stub 2013-11-07 08:31:10 -08:00
Jeff Lindsay beea0935e3 Merge pull request #290 from Jeewes/patch-1
Deprecated statement in installation guide.
2013-11-04 12:06:08 -08:00
Jeff Lindsay d457aaae99 an "installer" (really just config/setup) for prebuilt images (at least for now) 2013-10-30 19:39:20 -05:00
Jeff Lindsay 483860e429 reorganizing deploy readme 2013-10-30 17:31:59 -05:00
Jeff Lindsay b64fe76ec0 adding a DOKKU_TRACE env var to enable "set -x" 2013-10-29 17:44:36 -05:00
Jeff Lindsay df7507d1be normalizing shebang and bash options. also added long-term fix for bootstrap instructions 2013-10-29 17:13:02 -05:00
Jeff Lindsay 772629279e Merge pull request #173 from rhy-jot/2013-08-13/docker-group
Add git & dokku to the docker group, creating it if it doesn't exist.
2013-08-13 21:31:47 -07:00
Jeff Lindsay 2dfa0fac64 Merge pull request #146 from alexanderbeletsky/ssl2
issue #138: added wildcard support
2013-08-08 16:51:38 -07:00
Jeff Lindsay b515ddbf01 Merge pull request #159 from amaltson/patch-2
Link to Heroku node.js sample app
2013-08-08 08:29:18 -07:00
Jeff Lindsay 6ecc94b4a2 Merge pull request #158 from amaltson/patch-1
Fix bootstrap on clean install
2013-08-08 08:28:27 -07:00
Jeff Lindsay bd269aad42 Merge pull request #154 from darkpixel/patch-1
Hint about build packs requiring config files.  Closes GH-141
2013-08-06 12:12:33 -07:00
Jeff Lindsay 40fa670770 Merge pull request #150 from rhy-jot/master
Use apt to install lxc-docker vs downloading the .deb
2013-08-06 11:08:10 -07:00
Jeff Lindsay 7a24561194 Merge pull request #140 from chris-rock/hotfix/git_dependency
Hotfix/git dependency
2013-08-03 12:22:31 -07:00
Jeff Lindsay 9b27a3faf6 Merge pull request #104 from alexanderbeletsky/ssl
issue #101: added ssl configuration
2013-08-02 19:47:34 -07:00
Jeff Lindsay d26164f536 Merge pull request #132 from alexanderbeletsky/cleanup
No logs from cleanup step
2013-08-02 15:42:37 -07:00
Jeff Lindsay b44bf15c92 Merge pull request #127 from gaaady/patch-1
update readme to ubuntu 64
2013-07-29 18:32:13 -07:00
Jeff Lindsay eb189d639c Merge pull request #121 from alexanderbeletsky/cleanup
issue #120 add step to clean up all dead instances and none used images
2013-07-26 08:12:09 -07:00
Jeff Lindsay bb59f47cab Merge pull request #81 from eugeneware/remove_socket_file
Fix for nginx not reloading.
2013-07-24 16:02:29 -07:00
Jeff Lindsay a41bf80699 Merge pull request #113 from adelevie/master
fix readme typo (date => data)
2013-07-23 09:05:26 -07:00
Jeff Lindsay 5c25bd1557 Merge pull request #110 from TJC/enhancement/documentation_improvements
Documentation patch
2013-07-22 22:24:55 -07:00
Jeff Lindsay 25b04e12cc Merge pull request #109 from rhy-jot/patch-1
Fix typo, change up some wording
2013-07-22 22:08:02 -07:00
Jeff Lindsay c4f6393946 Merge pull request #108 from k4ml/fix-readme
Fix #107
2013-07-22 20:34:00 -07:00
Jeff Lindsay 9aa64f4f6c Merge pull request #106 from rhy-jot/patch-1
Use HTTPS for DOCKER_BIN
2013-07-22 12:55:59 -07:00
Jeff Lindsay f89430535a Merge pull request #99 from alexanderbeletsky/environment
issue #92: inserting environment file to docker instance
2013-07-20 08:57:11 -07:00
Jeff Lindsay 6257ebdcfe Merge pull request #86 from eugeneware/domain_support
support for fully qualified domain names not just subdomains
2013-07-19 13:24:00 -07:00
Jeff Lindsay 36c4f37ad6 Merge pull request #96 from unclejack/check_if_aufs_is_loaded_first
check if aufs is loaded before running modprobe
2013-07-18 09:05:38 -07:00
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
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
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
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
Jeff Lindsay 67958431b0 Merge pull request #74 from asm89/patch-4
Fix typo
2013-07-02 12:54:58 -07: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
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
Jeff Lindsay ee80167c0c Merge pull request #69 from asm89/authors
Add me to authors and sort
2013-07-01 15:15:38 -07: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
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
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
Jeff Lindsay 538925f7f4 Merge pull request #59 from grigio/master
Websocket support in NGINX ( ex: #45 )
2013-06-30 15:11:42 -07: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
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
Jeff Lindsay 02fa55342b include app name in repo name 2013-06-23 18:04:33 -07:00
Jeff Lindsay 5f1d2c4a3e remove debug output 2013-06-23 17:50:24 -07:00
Jeff Lindsay 0f230c3732 actually copy hidden/dot files. needed for .godir in go app 2013-06-23 17:33:17 -07:00
Jeff Lindsay ef7ac5bbdb moving test apps into place with proper check_deploy scripts 2013-06-23 17:17:56 -07:00