Commit Graph
14472 Commits
Author SHA1 Message Date
Jose Diaz-Gonzalez 4ad955adcb Merge pull request #1472 from progrium/1442_mh-default-scaling
Use processes defined in `Procfile` when generating `DOKKU_SCALE` file
2015-09-16 20:44:36 -07:00
Michael Hobbs c8b8b9bb93 generate DOKKU_SCALE based on Procfile if DOKKU_SCALE is not found. closes #1442 2015-09-16 17:17:26 -07:00
Michael Hobbs 1ebfedcfb5 [ci skip] make the default scaling logic clearer 2015-09-16 17:16:35 -07:00
Jose Diaz-Gonzalez 7443a2f49e Merge pull request #1466 from progrium/bashstyle
Follow bashstyle conventions where possible
2015-09-16 16:41:05 -07:00
Jose Diaz-Gonzalez 27a2478a33 Follow bashstyle where possible 2015-09-16 16:06:31 -07:00
Jose Diaz-Gonzalez 1c53250211 Merge pull request #1467 from progrium/1295-docker-engine
Upgrade dokku installation to use docker-engine
2015-09-16 16:02:02 -07:00
Jose Diaz-Gonzalez 30aa89ce8a Allow installation with lxc-docker
This will allow developers to run an `upgrade` on existing installations without breaking because docker-engine isn't yet in their apt lists...

[ci skip]
2015-09-16 15:53:08 -07:00
Jose Diaz-Gonzalez ebe4af70dc Merge pull request #1471 from progrium/1442_mh-default-scaling
Make the default scaling logic clearer
2015-09-16 15:51:00 -07:00
Michael Hobbs 433ced0f26 [ci skip] make the default scaling logic clearer 2015-09-16 15:33:01 -07:00
Michael Hobbs 95388b07bb support DOCKER_VERSION when installing via Makefile 2015-09-16 15:21:09 -07:00
Jose Diaz-Gonzalez 1e479c63bd Upgrade dokku installation to use docker-engine
Also simplify deb-based installation everywhere.

Closes #1295
Closes #1461
2015-09-15 13:35:45 -07:00
Jose Diaz-Gonzalez 1be4b94226 Merge pull request #1469 from progrium/1352_mh-nginx-logs-commands
Add nginx:access-logs and nginx:error-logs without sudo requirement
2015-09-15 12:03:32 -07:00
Jose Diaz-Gonzalez 64b57359b5 Merge pull request #1470 from progrium/1055_mh-nginx-ssl-terminated
Add nginx configuration for running behind load balancer
2015-09-15 11:20:35 -07:00
Michael Hobbs 39aedd158b Merge pull request #1468 from progrium/mh-install-deps-in-bootstrap
clean up semver logic and run install-dependencies after package installation
2015-09-15 10:48:01 -07:00
Michael Hobbs c62ac4bcc3 Merge pull request #1372 from SonicHedgehog/default-nginx-conf
Do no longer force-install a default nginx.conf
2015-09-15 10:47:57 -07:00
Michael Hobbs 964a84dc31 rename ssl terminated template to conform to naming scheme 2015-09-15 10:36:14 -07:00
Assaf Arkin 170f44f3d7 Added documentation 2015-09-15 10:31:27 -07:00
Assaf Arkin 1b84527f8c ADDED Nginx configuration for running behind load balancer 2015-09-15 10:31:27 -07:00
Michael Hobbs 72a1b76b63 don't require sudo for tailing logs since we're root anyway 2015-09-15 10:15:22 -07:00
Jiahao Li cca49230d9 Add nginx:access-logs and nginx:error-logs.
Add two nginx subcommands to display nginx error/access logs for a particular app.
2015-09-15 10:08:52 -07:00
Michael Hobbs 9ea0a8fe8b [ci skip] clean up semver logic and run install-dependencies after package installation 2015-09-15 10:00:51 -07:00
Jose Diaz-Gonzalez 63d8994243 Merge pull request #1228 from progrium/mh-switch-to-plugn
switching from pluginhook to plugn
2015-09-15 09:16:36 -07:00
Jose Diaz-Gonzalez c929edfbe5 Source plugins from $PLUGIN_AVAILABLE_PATH when not using common plugin
This will allow us to override any core plugin
2015-09-15 02:22:08 -07:00
Jose Diaz-Gonzalez cadba248b6 Fix source paths for common functions
[ci skip]
2015-09-15 02:17:28 -07:00
Michael Hobbs 872fbc130e new trigger for failed container retirement 2015-09-15 02:17:28 -07:00
Michael Hobbs 5fdd69a657 remove remnants of bad rebase 2015-09-15 02:17:28 -07:00
Michael Hobbs e8fb585fa8 rename buildstep hooks to buildpack 2015-09-15 02:17:28 -07:00
Jose Diaz-Gonzalez 4bcc9ac05d Remove deprecated calls 2015-09-15 02:17:28 -07:00
Michael Hobbs 8095df79f6 implement core plugin mgmt using plugn. add tests. 2015-09-15 02:17:28 -07:00
Michael Hobbs d6341e9ab7 set DOKKU_API_VERSION initially to 1 2015-09-15 02:17:28 -07:00
Michael Hobbs 30631692a5 cat is no longer needed by plugn 2015-09-15 02:17:28 -07:00
Michael Hobbs bef51a1c6b initial pass at converting deb to plugn 2015-09-15 02:17:28 -07:00
Michael Hobbs 424f9f1e5b only use plugn when referring to the project or command. otherwise use plugin 2015-09-15 02:17:28 -07:00
Michael Hobbs 18d234a925 move plugin-* to plugin: namespace 2015-09-15 02:17:28 -07:00
Michael Hobbs e873f27eac remove remnants of bad rebase 2015-09-15 02:17:28 -07:00
Jose Diaz-Gonzalez aaa7a4ecb0 Revert change that whitelisted dokku-labeled containers
Rather than having a one-off hack for "blessed" containers, we should solve the issue properly. As that would take a bit more work, reverting to the previous state is preferred.

Better that we solve a problem problem than with a hack that we'll need to roll back in the future.

Refs #1220

[ci skip]
2015-09-15 02:17:27 -07:00
Michael Hobbs cd3af6b961 rename buildstep hooks to buildpack 2015-09-15 02:17:27 -07:00
Jose Diaz-Gonzalez 525e6f503d Remove deprecated calls 2015-09-15 02:17:27 -07:00
Jose Diaz-Gonzalez 92497cf095 Do not delete containers with the label dokku.service
[ci skip]
2015-09-15 02:17:27 -07:00
Jose Diaz-Gonzalez c9bca838f0 Add missing $ 2015-09-15 02:17:27 -07:00
Jose Diaz-Gonzalez b3ddcbed53 Remove deprecated calls 2015-09-15 02:17:27 -07:00
Jose Diaz-Gonzalez aaae9adac3 update last doc references to pluginhook
[ci skip]
2015-09-15 02:16:40 -07:00
Jose Diaz-Gonzalez ce23cf6ce6 rename dokku_log_pluginhook_call 2015-09-15 02:16:40 -07:00
Jose Diaz-Gonzalez ad72a137e1 Fix sourcing of functions 2015-09-15 02:16:40 -07:00
Michael Hobbs 37b8ccbe9d [ci skip] revert another awkward doc change 2015-09-15 02:16:40 -07:00
Michael Hobbs fcfc02be52 [ci skip] rename plugn-triggers doc file 2015-09-15 02:16:40 -07:00
Michael Hobbs e2d138f55e [ci skip] revert awkward doc change 2015-09-15 02:16:40 -07:00
Michael Hobbs 2a4cbc7bee [ci skip] update docs 2015-09-15 02:16:40 -07:00
Michael Hobbs 6d70751cfc force removal of app directory on post-delete 2015-09-15 02:16:40 -07:00
Michael Hobbs 5d8359c12e fix nginx template paths 2015-09-15 02:16:40 -07:00